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

@@ -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 \