From: Christian Babeux <christian.babeux@efficios.com>
Date: Fri, 28 Nov 2014 21:39:50 +0000 (-0500)
Subject: Fix: Shorthand option -cp not supported in all version of Java
X-Git-Tag: v2.5.2~3
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=9a4f9fb252ba9f3da78feacd17dec46e10eed9ce;p=lttng-ust.git

Fix: Shorthand option -cp not supported in all version of Java

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/doc/examples/java-jul/Makefile b/doc/examples/java-jul/Makefile
index 3af44d3e..8b1f9827 100644
--- a/doc/examples/java-jul/Makefile
+++ b/doc/examples/java-jul/Makefile
@@ -32,7 +32,7 @@ else
 endif
 
 JFLAGS = -g
-JC = javac -cp "$(CLASSPATH):."
+JC = javac -classpath "$(CLASSPATH):."
 .SUFFIXES: .java .class
 .java.class:
 	$(JC) $(JFLAGS) $*.java
diff --git a/doc/examples/java-jul/run b/doc/examples/java-jul/run
index da8365b7..3c5952b2 100755
--- a/doc/examples/java-jul/run
+++ b/doc/examples/java-jul/run
@@ -19,6 +19,6 @@ else
 	LIBPATH="/usr/local/lib:/usr/lib"
 fi
 
-java -cp "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
+java -classpath "$CLASSPATH:." -Djava.library.path="$LIBPATH" Hello
 
 cd -
diff --git a/tests/java-jul/Makefile.am b/tests/java-jul/Makefile.am
index ba50fbf1..0c5b464b 100644
--- a/tests/java-jul/Makefile.am
+++ b/tests/java-jul/Makefile.am
@@ -20,6 +20,6 @@ clean-local:
 	rm -f *.class
 
 JULTest.class: JULTest.java
-	$(JCC) -cp $(JUL_jar_file) -d "$(builddir)" "$(srcdir)/JULTest.java"
+	$(JCC) -classpath $(JUL_jar_file) -d "$(builddir)" "$(srcdir)/JULTest.java"
 
 endif