From c3879c19c2d5141d9f554687552c234b64b029c7 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@thaumas.net>
Date: Wed, 20 Oct 2010 14:36:40 -0700
Subject: [PATCH] Also search the bare ocaml standard library path for llvm
 bindings.

Ubuntu ships the llvm bindings in /usr/lib/ocaml/llvm/ but Fedora
is installing them directly in /usr/lib/ocaml so we need to check
there as well.

The patch is untested; Fedora 14, the current beta, includes llvm 2.7.
It does add an unnecessary -I directive, but should at least have a
better chance of working on Fedora 15.
(cherry picked from commit 8af7360bd3de851668a133ae6ba4419e3722c6aa)
---
 src/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Makefile b/src/Makefile
index 9984393ab44..f7a1e116677 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -183,6 +183,7 @@ ifneq ($(CFG_LLVM_CONFIG),)
     $(shell ocamlc$(OPT) -config | grep standard_library:))
   CFG_OCAML_LLVM := $(shell \
       for path in $(shell $(CFG_LLVM_CONFIG) --libdir)/ocaml \
+          $(CFG_OCAML_LIBPATH) \
           $(CFG_OCAML_LIBPATH)/llvm \
           $(CFG_OCAML_LIBPATH)/llvm-$(CFG_LLVM_VERSION) ; do \
         if test -e $${path}/llvm.cma; then echo $${path}; break; fi \