projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Use env CLASSPATH when building log4j example
[lttng-ust.git]
/
doc
/
examples
/
java-log4j
/
run
diff --git
a/doc/examples/java-log4j/run
b/doc/examples/java-log4j/run
index 3a84f594b1484b3402bd8929bf64b59ab75bb0fa..9dca6087690d15bff9bd6b149a2f978762d726e0 100755
(executable)
--- a/
doc/examples/java-log4j/run
+++ b/
doc/examples/java-log4j/run
@@
-8,18
+8,23
@@
DIR=`dirname $0`
JARFILE="liblttng-ust-agent.jar"
DIR=`dirname $0`
JARFILE="liblttng-ust-agent.jar"
-LOG4J="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+
+# If system classpath is empty, try to guess log4j location
+if [ "x$CLASSPATH" = "x" ]; then
+ CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+fi
cd $DIR
if [ -f "$DIR/.intree" ]; then
cd $DIR
if [ -f "$DIR/.intree" ]; then
- CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$
LOG4J
"
+ CLASSPATH="../../../liblttng-ust-java-agent/java/$JARFILE:$
CLASSPATH
"
LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
else
LIBPATH="../../../liblttng-ust-java-agent/jni/log4j/.libs"
else
- CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$LOG4J"
- LIBPATH="/usr/local/lib:/usr/lib"
+ CLASSPATH="/usr/local/share/java/$JARFILE:/usr/share/java/$JARFILE:$CLASSPATH"
+ # Use system defined java.library.path
+ #LIBPATH="/usr/local/lib:/usr/lib"
fi
fi
-java -c
p "$CLASSPATH:.
" Hello
+java -c
lasspath "$CLASSPATH:." -Djava.library.path="$LIBPATH
" Hello
cd -
cd -
This page took
0.024005 seconds
and
4
git commands to generate.