Fix: running java examples out of tree

[lttng-ust.git] / doc / examples / java-jul / run

diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run
index b8342f7004db1a7202a26fca48211a48c5328711..6deb6fd8ca04741de67cdfc3997bf12b6aeed094 100755 (executable)
--- a/doc/examples/java-jul/run
+++ b/doc/examples/java-jul/run
@@ -8,6 +8,7 @@
 
 DIR=`dirname $0`
 JARFILE="liblttng-ust-agent.jar"
+JAVA_OPTIONS=""
 
 cd $DIR
 
@@ -16,9 +17,14 @@ if [ -f "$DIR/.intree" ]; then
        LIBPATH="../../../liblttng-ust-java-agent/jni/jul/.libs"
 else
        CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE"
-       LIBPATH="/usr/local/lib:/usr/lib"
+       # Use system defined java.library.path
+       #LIBPATH="/usr/local/lib:/usr/lib"
 fi
 
-java -cp "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
+if [ "x$LIBPATH" != "x" ]; then
+       JAVA_OPTIONS="$JAVA_OPTIONS -Djava.library.path=\"$LIBPATH\""
+fi
+
+java -classpath "$CLASSPATH:." $JAVA_OPTIONS Hello
 
 cd -