From d0f89fed85d7f6c07a4d76d2e11f3a6812b63dd4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 20 Nov 2012 18:40:15 +0000
Subject: ./run: Ensure all paths are built up cumulatively.

---
 run.in | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/run.in b/run.in
index 06f1d5aa..ec0b018a 100755
--- a/run.in
+++ b/run.in
@@ -56,11 +56,10 @@ chcon --reference=/tmp tmp 2>/dev/null ||:
 # Set local environment relative to this script.
 export LIBGUESTFS_PATH="$b/appliance"
 
-library_path="$b/src/.libs:$b/gobject/.libs"
 if [ -z "$LD_LIBRARY_PATH" ]; then
-    LD_LIBRARY_PATH=$library_path
+    LD_LIBRARY_PATH="$b/src/.libs:$b/gobject/.libs"
 else
-    LD_LIBRARY_PATH="$library_path:$LD_LIBRARY_PATH"
+    LD_LIBRARY_PATH="$b/src/.libs:$b/gobject/.libs:$LD_LIBRARY_PATH"
 fi
 export LD_LIBRARY_PATH
 
@@ -83,15 +82,30 @@ export PYTHONPATH
 
 # For Ruby.
 export RUBY=@RUBY@
-export RUBYLIB="$b/ruby/lib:$b/ruby/ext/guestfs"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$b/ruby/ext/guestfs"
+if [ -z "$RUBYLIB" ]; then
+    RUBYLIB="$b/ruby/lib:$b/ruby/ext/guestfs"
+else
+    RUBYLIB="$b/ruby/lib:$b/ruby/ext/guestfs:$RUBYLIB"
+fi
+export RUBYLIB
+export LD_LIBRARY_PATH="$b/ruby/ext/guestfs:$LD_LIBRARY_PATH"
 
 # For OCaml.
-export CAML_LD_LIBRARY_PATH="$b/ocaml"
+if [ -z "$CAML_LD_LIBRARY_PATH" ]; then
+    CAML_LD_LIBRARY_PATH="$b/ocaml"
+else
+    CAML_LD_LIBRARY_PATH="$b/ocaml:$CAML_LD_LIBRARY_PATH"
+fi
+export CAML_LD_LIBRARY_PATH
 
 # For Java.
 export JAVA_EXE=@JAVA_EXE@
-export CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
+if [ -z "$CLASSPATH" ]; then
+    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar"
+else
+    CLASSPATH="$b/java:$b/java/t:$b/java/libguestfs-@VERSION@.jar:$CLASSPATH"
+fi
+export CLASSPATH
 
 # For Lua.
 if [ -z "$LUA_CPATH" ]; then
-- 
cgit