summaryrefslogtreecommitdiff
path: root/rhino
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 /rhino
parenta40fb598ec8ebb4a8c8793dd7be6ef93ae8941c1 (diff)
gbuild: remove gb_ExternalPackage_add_jar_for_install
Deliver all external jar files to INSTDIR directly. Change-Id: Ibfaabf713da01e752517dc400200a6918d82db6d
Diffstat (limited to 'rhino')
-rw-r--r--rhino/ExternalPackage_rhino.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/rhino/ExternalPackage_rhino.mk b/rhino/ExternalPackage_rhino.mk
index 45ccf14c894a..7dc6fa6d157e 100644
--- a/rhino/ExternalPackage_rhino.mk
+++ b/rhino/ExternalPackage_rhino.mk
@@ -9,8 +9,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino))
+$(eval $(call gb_ExternalPackage_set_outdir,rhino,$(INSTROOT)))
+
$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino))
-$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar))
+$(eval $(call gb_ExternalPackage_add_file,rhino,$(LIBO_SHARE_JAVA_FOLDER)/js.jar,build/rhino1_5R5/js.jar))
# vim: set noet sw=4 ts=4: