diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 18:40:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 23:31:30 +0200 |
| commit | 461d830ed8f664e171245b0cf9d53dc33a0f04d2 (patch) | |
| tree | 6ff4a44bbeb727a977675d1b90da2cfa890de4ef /RepositoryExternal.mk | |
| parent | 15a9ef2147e2cdcc1ec5bb2f63e0154bcd5fa651 (diff) | |
stop using apache-commons jars from OUTDIR too
Change-Id: I0d9282cd3a267ad2d25b43adbf995365aaa56fa1
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2232710872cb..57e8d6bc2384 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2820,27 +2820,31 @@ $(eval $(call gb_Helper_register_jars,OXT,\ )) define gb_Jar__use_commons-codec -$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-codec-1.6.jar) +$(call gb_Jar_use_external_project,$(1),apache_commons_codec) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_codec)/dist/commons-codec-1.6-SNAPSHOT.jar,commons-codec-1.6.jar) endef define gb_ExternalProject__use_commons-codec $(call gb_ExternalProject_use_external_project,$(1),apache_commons_codec) endef define gb_Jar__use_commons-httpclient -$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-httpclient-3.1.jar) +$(call gb_Jar_use_external_project,$(1),apache_commons_httpclient) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)/dist/commons-httpclient.jar,commons-httpclient-3.1.jar) endef define gb_ExternalProject__use_commons-httpclient $(call gb_ExternalProject_use_external_project,$(1),apache_commons_httpclient) endef define gb_Jar__use_commons-lang -$(call gb_Jar_use_external_jar,$(1),$(OUTDIR)/bin/commons-lang-2.4.jar) +$(call gb_Jar_use_external_project,$(1),apache_commons_lang) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,apache_commons_lang)/dist/commons-lang-2.4.jar,commons-lang-2.4.jar) endef define gb_ExternalProject__use_commons-lang $(call gb_ExternalProject_use_external_project,$(1),apache_commons_lang) endef define gb_Jar__use_commons-logging +$(call gb_Jar_use_external_project,$(1),apache_commons_logging) $(call gb_Jar_use_jar,$(1),commons-logging-1.1.1) endef define gb_ExternalProject__use_commons-logging |