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