Index: local/autoconf/configure.ac
===================================================================
--- local.orig/autoconf/configure.ac	2010-03-26 19:04:54.000000000 -0700
+++ local/autoconf/configure.ac	2010-03-26 19:05:08.000000000 -0700
@@ -758,20 +758,6 @@
   ;;
 esac
 
-dnl Allow the ocaml libdir to be overridden. This could go in a configure
-dnl script for bindings/ocaml/configure, except that its auto value depends on
-dnl OCAMLC, which is found here to support tests.
-AC_ARG_WITH([ocaml-libdir],
-  [AS_HELP_STRING([--with-ocaml-libdir],
-    [Specify install location for ocaml bindings (default is stdlib)])],
-  [],
-  [withval=auto])
-case "$withval" in
-  auto) with_ocaml_libdir="$withval" ;;
-  /* | [[A-Za-z]]:[[\\/]]*) with_ocaml_libdir="$withval" ;;
-  *) AC_MSG_ERROR([Invalid path for --with-ocaml-libdir. Provide full path]) ;;
-esac
-
 AC_ARG_WITH(c-include-dirs,
   AS_HELP_STRING([--with-c-include-dirs],
     [Colon separated list of directories clang will search for headers]),,
@@ -1473,19 +1459,6 @@
     if test "x$OCAMLFIND" = x ; then
       AC_MSG_WARN([--enable-bindings=ocaml specified, but ocamlfind not found. Try configure OCAMLFIND=/path/to/ocamlfind])
     fi
-    if test "x$with_ocaml_libdir" != xauto ; then
-      AC_SUBST(OCAML_LIBDIR,$with_ocaml_libdir)
-    else
-      ocaml_stdlib="`"$OCAMLC" -where`"
-      if test "$LLVM_PREFIX" '<' "$ocaml_stdlib" -a "$ocaml_stdlib" '<' "$LLVM_PREFIX~"
-      then
-        # ocaml stdlib is beneath our prefix; use stdlib
-        AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
-      else
-        # ocaml stdlib is outside our prefix; use libdir/ocaml
-        AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
-      fi
-    fi
     ;;
   esac
 done
Index: local/bindings/ocaml/Makefile.ocaml
===================================================================
--- local.orig/bindings/ocaml/Makefile.ocaml	2010-03-26 19:04:54.000000000 -0700
+++ local/bindings/ocaml/Makefile.ocaml	2010-03-26 19:19:54.000000000 -0700
@@ -25,9 +25,6 @@
 
 include $(LEVEL)/Makefile.common
 
-# Intentionally ignore PROJ_prefix here. We want the ocaml stdlib. However, the
-# user can override this with OCAML_LIBDIR or configure --with-ocaml-libdir=.
-PROJ_libocamldir := $(DESTDIR)$(OCAML_LIBDIR)
 OcamlDir := $(LibDir)/ocaml
 
 # Info from llvm-config and similar
@@ -67,7 +64,7 @@
 Archive.CMXA := $(strip $(OCAMLOPT) -a $(OCAMLAFLAGS) $(OCAMLDEBUGFLAG) -o)
 
 ifdef OCAMLOPT
-Archive.EXE := $(strip $(OCAMLOPT) -cc $(CXX) $(OCAMLCFLAGS) $(UsedOcamLibs:%=%.cmxa) $(OCAMLDEBUGFLAG) -o)
+Archive.EXE := $(strip $(OCAMLFIND) ocamlopt -cc $(CXX) $(OCAMLCFLAGS) $(UsedOcamlPkgs:%=-package %) $(OCAMLDEBUGFLAG) -o)
 else
 Archive.EXE := $(strip $(OCAMLC) -cc $(CXX) $(OCAMLCFLAGS) $(OCAMLDEBUGFLAG:%=%.cma) -o)
 endif
@@ -117,7 +114,7 @@
 endif
 
 # Installation targets
-DestLibs := $(UsedLibNames:%=$(PROJ_libocamldir)/%)
+DestLibs := $(UsedLibNames:%=.%.ocaml-install.stamp)
 
 ifdef LIBRARYNAME
 DestA    := $(PROJ_libocamldir)/lib$(LIBRARYNAME).a
@@ -158,8 +155,6 @@
 ifdef LibraryA
 all-local:: $(LibraryA)
 clean-local:: clean-a
-install-local:: install-a
-uninstall-local:: uninstall-a
 
 $(LibraryA): $(ObjectsO) $(OcamlDir)/.dir
 	$(Echo) "Building $(BuildMode) $(notdir $@)"
@@ -169,16 +164,6 @@
 
 clean-a::
 	-$(Verb) $(RM) -f $(LibraryA)
-
-install-a:: $(LibraryA)
-	$(Echo) "Installing $(BuildMode) $(DestA)"
-	$(Verb) $(MKDIR) $(PROJ_libocamldir)
-	$(Verb) $(INSTALL) $(LibraryA) $(DestA)
-	$(Verb) 
-
-uninstall-a::
-	$(Echo) "Uninstalling $(DestA)"
-	-$(Verb) $(RM) -f $(DestA)
 endif
 
 
@@ -186,8 +171,6 @@
 
 all-local:: build-deplibs
 clean-local:: clean-deplibs
-install-local:: install-deplibs
-uninstall-local:: uninstall-deplibs
 
 build-deplibs: $(OutputLibs)
 
@@ -200,23 +183,12 @@
 clean-deplibs:
 	$(Verb) $(RM) -f $(OutputLibs)
 
-install-deplibs:
-	$(Verb) $(MKDIR) $(PROJ_libocamldir)
-	$(Verb) for i in $(DestLibs:$(PROJ_libocamldir)/%=%); do \
-	  ln -sf "$(PROJ_libdir)/$$i" "$(PROJ_libocamldir)/$$i"; \
-	done
-
-uninstall-deplibs:
-	$(Verb) $(RM) -f $(DestLibs)
-
 
 ##===- Build ocaml interfaces (.mli's -> .cmi's) --------------------------===##
 
 ifneq ($(OcamlHeaders),)
 all-local:: build-cmis
 clean-local:: clean-cmis
-install-local:: install-cmis
-uninstall-local:: uninstall-cmis
 
 build-cmis: $(OutputsCMI)
 
@@ -229,28 +201,6 @@
 
 clean-cmis::
 	-$(Verb) $(RM) -f $(OutputsCMI)
-
-# Also install the .mli's (headers) as documentation.
-install-cmis: $(OutputsCMI) $(OcamlHeaders)
-	$(Verb) $(MKDIR) $(PROJ_libocamldir)
-	$(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \
-	  $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
-	  $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \
-	done
-	$(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \
-	  $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
-	  $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \
-	done
-
-uninstall-cmis::
-	$(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \
-	  $(EchoCmd) "Uninstalling $(PROJ_libocamldir)/$$i"; \
-	  $(RM) -f "$(PROJ_libocamldir)/$$i"; \
-	done
-	$(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \
-	  $(EchoCmd) "Uninstalling $(PROJ_libocamldir)/$$i"; \
-	  $(RM) -f "$(PROJ_libocamldir)/$$i"; \
-	done
 endif
 
 
@@ -263,8 +213,6 @@
 ifdef LIBRARYNAME
 all-local:: $(OutputCMA)
 clean-local:: clean-cma
-install-local:: install-cma
-uninstall-local:: uninstall-cma
 
 $(OutputCMA): $(LibraryCMA) $(OcamlDir)/.dir
 	$(Verb) $(CP) -f $< $@
@@ -275,15 +223,6 @@
 
 clean-cma::
 	$(Verb) $(RM) -f $(OutputCMA) $(UsedLibNames:%=$(OcamlDir)/%)
-
-install-cma:: $(OutputCMA)
-	$(Echo) "Installing $(BuildMode) $(DestCMA)"
-	$(Verb) $(MKDIR) $(PROJ_libocamldir)
-	$(Verb) $(DataInstall) $(OutputCMA) "$(DestCMA)"
-
-uninstall-cma::
-	$(Echo) "Uninstalling $(DestCMA)"
-	-$(Verb) $(RM) -f $(DestCMA)
 endif
 
 ##===- Build optimized ocaml archive (.ml's -> .cmx's -> .cmxa, .a) -------===##
@@ -302,8 +241,6 @@
 ifdef LIBRARYNAME
 all-local:: $(OutputCMXA) $(OutputsCMX)
 clean-local:: clean-cmxa
-install-local:: install-cmxa
-uninstall-local:: uninstall-cmxa
 
 $(OutputCMXA): $(LibraryCMXA)
 	$(Verb) $(CP) -f $< $@
@@ -317,26 +254,6 @@
 clean-cmxa::
 	$(Verb) $(RM) -f $(OutputCMXA) $(OutputCMXA:.cmxa=.a) $(OutputsCMX)
 
-install-cmxa:: $(OutputCMXA) $(OutputsCMX)
-	$(Verb) $(MKDIR) $(PROJ_libocamldir)
-	$(Echo) "Installing $(BuildMode) $(DestCMXA)"
-	$(Verb) $(DataInstall) $(OutputCMXA) $(DestCMXA)
-	$(Echo) "Installing $(BuildMode) $(DestCMXA:.cmxa=.a)"
-	$(Verb) $(DataInstall) $(OutputCMXA:.cmxa=.a) $(DestCMXA:.cmxa=.a)
-	$(Verb) for i in $(OutputsCMX:$(OcamlDir)/%=%); do \
-	  $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \
-	  $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \
-	done
-
-uninstall-cmxa::
-	$(Echo) "Uninstalling $(DestCMXA)"
-	$(Verb) $(RM) -f $(DestCMXA)
-	$(Echo) "Uninstalling $(DestCMXA:.cmxa=.a)"
-	$(Verb) $(RM) -f $(DestCMXA:.cmxa=.a)
-	$(Verb) for i in $(OutputsCMX:$(OcamlDir)/%=%); do \
-	  $(EchoCmd) "Uninstalling $(PROJ_libocamldir)/$$i"; \
-	  $(RM) -f $(PROJ_libocamldir)/$$i; \
-	done
 endif
 endif
 
@@ -360,6 +277,19 @@
 endif
 endif
 
+##===- Install libraries as a package -------------------------------------===##
+
+install-local:: ocamlfind-install
+uninstall-local:: ocamlfind-uninstall
+
+ocamlfind-install: $(PROJ_SRC_DIR)/META $(LibraryA) \
+		$(UsedLibNames:%=$(LibDir)/%) $(ObjDir)/*.cmi $(OutputCMA) $(OutputCMXA)
+	$(OCAMLFIND) remove $(LIBRARYNAME)
+	$(OCAMLFIND) install $(LIBRARYNAME) $^
+
+ocamlfind-uninstall:
+	$(OCAMLFIND) remove $(LIBRARYNAME)
+
 ##===- Generate documentation ---------------------------------------------===##
 
 $(ObjDir)/$(LIBRARYNAME).odoc: $(ObjectsCMI)
Index: local/configure
===================================================================
--- local.orig/configure	2010-03-26 19:04:54.000000000 -0700
+++ local/configure	2010-03-26 19:05:08.000000000 -0700
@@ -748,6 +748,7 @@
 OCAMLOPT
 OCAMLDEP
 OCAMLDOC
+OCAMLFIND
 GAS
 INSTALL_LTDL_TRUE
 INSTALL_LTDL_FALSE
@@ -784,7 +785,6 @@
 LLVM_CONFIGTIME
 BINDINGS_TO_BUILD
 ALL_BINDINGS
-OCAML_LIBDIR
 ENABLE_VISIBILITY_INLINES_HIDDEN
 RPATH
 RDYNAMIC
@@ -1439,8 +1439,6 @@
   --with-optimize-option  Select the compiler options to use for optimized
                           builds
   --with-extra-options    Specify additional options to compile LLVM with
-  --with-ocaml-libdir     Specify install location for ocaml bindings (default
-                          is stdlib)
   --with-c-include-dirs   Colon separated list of directories clang will
                           search for headers
   --with-cxx-include-root Directory with the libstdc++ headers.
@@ -5211,22 +5209,6 @@
 esac
 
 
-# Check whether --with-ocaml-libdir was given.
-if test "${with_ocaml_libdir+set}" = set; then
-  withval=$with_ocaml_libdir;
-else
-  withval=auto
-fi
-
-case "$withval" in
-  auto) with_ocaml_libdir="$withval" ;;
-  /* | [A-Za-z]:[\\/]*) with_ocaml_libdir="$withval" ;;
-  *) { { echo "$as_me:$LINENO: error: Invalid path for --with-ocaml-libdir. Provide full path" >&5
-echo "$as_me: error: Invalid path for --with-ocaml-libdir. Provide full path" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-
-
 # Check whether --with-c-include-dirs was given.
 if test "${with_c_include_dirs+set}" = set; then
   withval=$with_c_include_dirs;
@@ -8557,6 +8539,51 @@
   test -n "$OCAMLDOC" && break
 done
 
+for ac_prog in ocamlfind
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_OCAMLFIND+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $OCAMLFIND in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OCAMLFIND="$OCAMLFIND" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_OCAMLFIND="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+OCAMLFIND=$ac_cv_path_OCAMLFIND
+if test -n "$OCAMLFIND"; then
+  { echo "$as_me:$LINENO: result: $OCAMLFIND" >&5
+echo "${ECHO_T}$OCAMLFIND" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  test -n "$OCAMLFIND" && break
+done
+
 for ac_prog in gas as
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -11156,7 +11183,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11159 "configure"
+#line 11186 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -20030,21 +20057,9 @@
       { echo "$as_me:$LINENO: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found. Try configure OCAMLOPT=/path/to/ocamlopt" >&5
 echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found. Try configure OCAMLOPT=/path/to/ocamlopt" >&2;}
           fi
-    if test "x$with_ocaml_libdir" != xauto ; then
-      OCAML_LIBDIR=$with_ocaml_libdir
-
-    else
-      ocaml_stdlib="`"$OCAMLC" -where`"
-      if test "$LLVM_PREFIX" '<' "$ocaml_stdlib" -a "$ocaml_stdlib" '<' "$LLVM_PREFIX~"
-      then
-        # ocaml stdlib is beneath our prefix; use stdlib
-        OCAML_LIBDIR=$ocaml_stdlib
-
-      else
-        # ocaml stdlib is outside our prefix; use libdir/ocaml
-        OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
-
-      fi
+    if test "x$OCAMLFIND" = x ; then
+      { echo "$as_me:$LINENO: WARNING: --enable-bindings=ocaml specified, but ocamlfind not found. Try configure OCAMLFIND=/path/to/ocamlfind" >&5
+echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlfind not found. Try configure OCAMLFIND=/path/to/ocamlfind" >&2;}
     fi
     ;;
   esac
@@ -21068,6 +21083,7 @@
 OCAMLOPT!$OCAMLOPT$ac_delim
 OCAMLDEP!$OCAMLDEP$ac_delim
 OCAMLDOC!$OCAMLDOC$ac_delim
+OCAMLFIND!$OCAMLFIND$ac_delim
 GAS!$GAS$ac_delim
 INSTALL_LTDL_TRUE!$INSTALL_LTDL_TRUE$ac_delim
 INSTALL_LTDL_FALSE!$INSTALL_LTDL_FALSE$ac_delim
@@ -21104,7 +21120,6 @@
 LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
 BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
 ALL_BINDINGS!$ALL_BINDINGS$ac_delim
-OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
 ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
 RPATH!$RPATH$ac_delim
 RDYNAMIC!$RDYNAMIC$ac_delim
Index: local/bindings/ocaml/analysis/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/analysis/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Analysis"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_analysis.cma"
+archive(native) = "llvm_analysis.cmxa"
+
Index: local/bindings/ocaml/bitreader/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/bitreader/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Bitcode Reader"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_bitreader.cma"
+archive(native) = "llvm_bitreader.cmxa"
+
Index: local/bindings/ocaml/bitwriter/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/bitwriter/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Bitcode Writer"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_bitwriter.cma"
+archive(native) = "llvm_bitwriter.cmxa"
+
Index: local/bindings/ocaml/executionengine/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/executionengine/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Execution Engine"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_executionengine.cma"
+archive(native) = "llvm_executionengine.cmxa"
+
Index: local/bindings/ocaml/llvm/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/llvm/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "Low-Level Virtual Machine compiler infrastructure"
+requires = ""
+version = "svn"
+archive(byte) = "llvm.cma"
+archive(native) = "llvm.cmxa"
+
Index: local/bindings/ocaml/target/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/target/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Targets"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_target.cma"
+archive(native) = "llvm_target.cmxa"
+
Index: local/bindings/ocaml/transforms/scalar/META
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ local/bindings/ocaml/transforms/scalar/META	2010-03-26 19:05:08.000000000 -0700
@@ -0,0 +1,6 @@
+description = "LLVM Transforms"
+requires = ""
+version = "svn"
+archive(byte) = "llvm_scalar_opts.cma"
+archive(native) = "llvm_scalar_opts.cmxa"
+
Index: local/Makefile.config.in
===================================================================
--- local.orig/Makefile.config.in	2010-03-26 19:04:54.000000000 -0700
+++ local/Makefile.config.in	2010-03-26 19:05:08.000000000 -0700
@@ -164,6 +164,7 @@
 OCAMLOPT   := @OCAMLOPT@
 OCAMLDEP   := @OCAMLDEP@
 OCAMLDOC   := @OCAMLDOC@
+OCAMLFIND  := @OCAMLFIND@
 GAS        := @GAS@
 POD2HTML   := @POD2HTML@
 POD2MAN    := @POD2MAN@
Index: local/examples/OCaml-Kaleidoscope/Chapter2/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter2/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter2/Makefile	2010-03-26 19:20:51.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch2
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm
+UsedOcamlPkgs := llvm
 
 OCAMLCFLAGS += -pp camlp4of
 
Index: local/examples/OCaml-Kaleidoscope/Chapter3/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter3/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter3/Makefile	2010-03-26 19:21:02.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch3
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm llvm_analysis
+UsedOcamlPkgs := llvm llvm_analysis
 
 OCAMLCFLAGS += -pp camlp4of
 
Index: local/examples/OCaml-Kaleidoscope/Chapter4/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter4/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter4/Makefile	2010-03-26 19:21:12.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch4
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
+UsedOcamlPkgs := llvm llvm_analysis llvm_executionengine llvm_target \
 	llvm_scalar_opts
 
 OCAMLCFLAGS += -pp camlp4of
Index: local/examples/OCaml-Kaleidoscope/Chapter5/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter5/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter5/Makefile	2010-03-26 19:21:16.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch5
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
+UsedOcamlPkgs := llvm llvm_analysis llvm_executionengine llvm_target \
 	llvm_scalar_opts
 
 OCAMLCFLAGS += -pp camlp4of
Index: local/examples/OCaml-Kaleidoscope/Chapter6/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter6/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter6/Makefile	2010-03-26 19:21:19.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch6
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
+UsedOcamlPkgs := llvm llvm_analysis llvm_executionengine llvm_target \
 	llvm_scalar_opts
 
 OCAMLCFLAGS += -pp camlp4of
Index: local/examples/OCaml-Kaleidoscope/Chapter7/Makefile
===================================================================
--- local.orig/examples/OCaml-Kaleidoscope/Chapter7/Makefile	2010-03-24 11:23:50.000000000 -0700
+++ local/examples/OCaml-Kaleidoscope/Chapter7/Makefile	2010-03-26 19:21:26.000000000 -0700
@@ -15,7 +15,7 @@
 TOOLNAME := OCaml-Kaleidoscope-Ch7
 EXAMPLE_TOOL := 1
 UsedComponents := core
-UsedOcamLibs := llvm llvm_analysis llvm_executionengine llvm_target \
+UsedOcamlPkgs := llvm llvm_analysis llvm_executionengine llvm_target \
 	llvm_scalar_opts
 
 OCAMLCFLAGS += -pp camlp4of
