summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard W.M. Jones <[email protected]>2012-06-28 13:46:31 +0100
committerRichard W.M. Jones <[email protected]>2012-06-28 13:46:31 +0100
commit04a533ca8c8fcea6d84a14f4ae8a672df94a2e46 (patch)
treeba1e798855d31991b1c4021d9ba04ca7acc9bd3f
parente7d2d3cb8905598b57c4d24a933ef25fdb021b1d (diff)
downloadlibguestfs-04a533ca8c8fcea6d84a14f4ae8a672df94a2e46.tar.gz
libguestfs-04a533ca8c8fcea6d84a14f4ae8a672df94a2e46.tar.xz
libguestfs-04a533ca8c8fcea6d84a14f4ae8a672df94a2e46.zip
ocaml: Set CAML_LD_LIBRARY_PATH in run script.
-rw-r--r--ocaml/Makefile.am1
-rw-r--r--run.in3
2 files changed, 3 insertions, 1 deletions
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-@[email protected]"
OSZAR »