X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=inline;f=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2FMakefile.am;fp=liblttng-ust-java-agent%2Fjava%2Flttng-ust-agent-log4j%2FMakefile.am;h=fc4a9160a5487dbf8d26830db70e6e787aa45ae2;hb=0f6f0e89dace3a34dae3e06e5af0515a49149acd;hp=0c9475a328d7f19541b400f97ac9d3ff2d9e85d7;hpb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;p=lttng-ust.git

diff --git a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
index 0c9475a3..fc4a9160 100644
--- a/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
+++ b/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile.am
@@ -1,5 +1,5 @@
 JAVAROOT = .
-CLASSPATH_ENV = CLASSPATH=$(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
+AM_JAVACFLAGS = -classpath $(CLASSPATH):$(builddir)/../lttng-ust-agent-common/lttng-ust-agent-common.jar
 
 pkgpath = org/lttng/ust/agent/log4j
 
@@ -29,7 +29,7 @@ $(jarfile): classnoinst.stamp
 if !HAVE_JAVAH
 # If we don't have javah, assume we are running openjdk >= 10 and use javac
 # to generate the jni header file.
-AM_JAVACFLAGS = -h $(log4jjniout)
+AM_JAVACFLAGS += -h $(log4jjniout)
 else
 log4j-jni-header.stamp: $(dist_noinst_JAVA)
 	$(JAVAH) -classpath $(CLASSPATH):$(srcdir) -d $(log4jjniout) $(JAVAHFLAGS) org.lttng.ust.agent.log4j.LttngLog4jApi && \