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
/
Makefile
diff --git
a/doc/examples/java-log4j/Makefile
b/doc/examples/java-log4j/Makefile
index 4b5996422c6f3768f184033fecf8f1f04997ea8c..2c629c37efe0fb23f03cf7d0966942319c8c7676 100644
(file)
--- a/
doc/examples/java-log4j/Makefile
+++ b/
doc/examples/java-log4j/Makefile
@@
-20,7
+20,11
@@
JFLAGS = -g
# Default JUL jar name.
JARFILE=liblttng-ust-agent.jar
# Default JUL jar name.
JARFILE=liblttng-ust-agent.jar
-LOG4J=/usr/share/java/log4j.jar
+
+# If system classpath is empty, try to guess log4j location
+ifeq "$(CLASSPATH)" ""
+ CLASSPATH="/usr/local/share/java/log4j.jar:/usr/share/java/log4j.jar"
+endif
# Check if the top level makefile overrides the JUL Jar file name.
ifneq "$(JAVA_JARFILE_OVERRIDE)" ""
# Check if the top level makefile overrides the JUL Jar file name.
ifneq "$(JAVA_JARFILE_OVERRIDE)" ""
@@
-29,9
+33,9
@@
endif
# Check if the top level makefile overrides the JUL classpath.
ifeq "$(JAVA_CLASSPATH_OVERRIDE)" ""
# Check if the top level makefile overrides the JUL classpath.
ifeq "$(JAVA_CLASSPATH_OVERRIDE)" ""
- CLASSPATH
=/usr/local/share/java/$(JARFILE):/usr/share/java/$(JARFILE):$(LOG4J
)
+ CLASSPATH
:=/usr/local/share/java/$(JARFILE):/usr/share/java/$(JARFILE):$(CLASSPATH
)
else
else
- CLASSPATH
=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(LOG4J
)
+ CLASSPATH
:=$(JAVA_CLASSPATH_OVERRIDE)/$(JARFILE):$(CLASSPATH
)
endif
JC = javac -classpath "$(CLASSPATH):."
endif
JC = javac -classpath "$(CLASSPATH):."
This page took
0.022774 seconds
and
4
git commands to generate.