From 04a533ca8c8fcea6d84a14f4ae8a672df94a2e46 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 28 Jun 2012 13:46:31 +0100
Subject: ocaml: Set CAML_LD_LIBRARY_PATH in run script.

---
 ocaml/Makefile.am | 1 -
 run.in            | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 232edb7f..ac0106d4 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -81,7 +81,6 @@ html/index.html: $(srcdir)/guestfs*.mli $(srcdir)/guestfs*.ml
 endif
 
 TESTS_ENVIRONMENT = \
-	CAML_LD_LIBRARY_PATH=. \
 	$(top_builddir)/run --test \
 	$(VG)
 
diff --git a/run.in b/run.in
index 1d34be18..cb55bcb3 100644
--- a/run.in
+++ b/run.in
@@ -74,6 +74,9 @@ export PYTHONPATH
 # For Ruby.
 export RUBY=@RUBY@
 
+# For OCaml.
+export CAML_LD_LIBRARY_PATH="$b/ocaml"
+
 # For Java.
 export JAVA=@JAVA@
 export CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
-- 
cgit