From 461d830ed8f664e171245b0cf9d53dc33a0f04d2 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 25 Oct 2013 18:40:48 +0200 Subject: stop using apache-commons jars from OUTDIR too Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1 --- external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'external/jfreereport/ExternalProject_jfreereport_flow_engine.mk') diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 08b86134cedc..d88b1c9f58e5 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -23,7 +23,9 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -q \ -f build.xml \ -Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \ - $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),-Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) )\ + $(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\ + -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR) \ + -Dcommons-logging.jar=$(INSTROOT)/$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar) \ -Dlib=$(OUTDIR)/bin \ $(if $(filter yes,$(JAVACISGCJ))\ ,-Dbuild.compiler=gcj \ -- cgit