summaryrefslogtreecommitdiffstats
path: root/external/beanshell
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/beanshell
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/beanshell')
-rw-r--r--external/beanshell/ExternalPackage_beanshell.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk
index 1346b889cbd0..0cb34cd30010 100644
--- a/external/beanshell/ExternalPackage_beanshell.mk
+++ b/external/beanshell/ExternalPackage_beanshell.mk
@@ -9,8 +9,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell))
+$(eval $(call gb_ExternalPackage_set_outdir,beanshell,$(INSTROOT)))
+
$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell))
-$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
+$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b1.jar))
# vim: set noet sw=4 ts=4: