summaryrefslogtreecommitdiffstats
path: root/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-25 21:30:05 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-25 23:31:31 +0200
commit7b1da9a478b53c29e5480040687c30460ecaa462 (patch)
tree3587ea55eae58472bbecf34b1c1a6d6b5270365f /external/jfreereport/ExternalPackage_jfreereport_libbase.mk
parentjfreereport: use jar files from WORKDIR (diff)
downloadcore-7b1da9a478b53c29e5480040687c30460ecaa462.tar.gz
core-7b1da9a478b53c29e5480040687c30460ecaa462.zip
gbuild: remove gb_ExternalPackage_add_jar_for_install
Deliver all external jar files to INSTDIR directly. Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d
Diffstat (limited to 'external/jfreereport/ExternalPackage_jfreereport_libbase.mk')
-rw-r--r--external/jfreereport/ExternalPackage_jfreereport_libbase.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
index 0f6ee51d93fa..eebb8092df0f 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
@@ -12,8 +12,10 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libbase,$(INSTROOT)))
+
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase))
-$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_file,jfreereport_libbase,$(LIBO_SHARE_JAVA_FOLDER)/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
# vim: set noet sw=4 ts=4: