diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 19:39:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:11 +0100 |
| commit | 7d2f7c6d7eab19fd8d692ed0f162c70103b091f0 (patch) | |
| tree | 86c243e74fbb0fd5002d14e53c1a4c4e9e2ebe32 /external | |
| parent | 32db4993c469613362211e7ef8423da6d7f4b182 (diff) | |
normalize values of SYSTEM_APACHE_COMMONS, SYSTEM_BSH
Change-Id: Ia6adb8ae07ec80e83bc67084dfbd0bc6136ed8b7
Diffstat (limited to 'external')
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_flow_engine.mk | 2 | ||||
| -rw-r--r-- | external/jfreereport/ExternalProject_jfreereport_liblayout.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index e93cc0b6241b..d2efb32b5f80 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -23,7 +23,7 @@ $(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)),\ + $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ -Dlibbase.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)/dist/libbase-$(LIBBASE_VERSION).jar \ diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index e6248f0c2688..861d25a276b7 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,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)),\ + $(if $(SYSTEM_APACHE_COMMONS),\ -Dcommons-logging.jar=$(COMMONS_LOGGING_JAR), \ -Dcommons-logging.jar="$(call gb_UnpackedTarball_get_dir,apache_commons_logging)/target/commons-logging-1.1.1-SNAPSHOT.jar") \ -Dflute.jar=$(call gb_UnpackedTarball_get_dir,jfreereport_flute)/dist/flute-$(FLUTE_VERSION).jar \ |