diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-01 14:44:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-01 16:55:40 +0200 |
| commit | f7c55abf4f80b3c7228b6fe416e3e548e8adcd26 (patch) | |
| tree | b90a95f8a2590684377ff2c0cd85f1e633de6a5e /hsqldb | |
| parent | 617d89384947223e41bf2ed613af247e2bb7db82 (diff) | |
copy external jars to instdir
Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec
Diffstat (limited to 'hsqldb')
| -rw-r--r-- | hsqldb/ExternalPackage_hsqldb.mk (renamed from hsqldb/Package_hsqldb.mk) | 6 | ||||
| -rw-r--r-- | hsqldb/Module_hsqldb.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hsqldb/Package_hsqldb.mk b/hsqldb/ExternalPackage_hsqldb.mk index 2088d6f43f8c..770ca063d714 100644 --- a/hsqldb/Package_hsqldb.mk +++ b/hsqldb/ExternalPackage_hsqldb.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,hsqldb_project,$(call gb_UnpackedTarball_get_dir,hsqldb))) +$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb)) -$(eval $(call gb_Package_use_external_project,hsqldb_project,hsqldb)) +$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb)) -$(eval $(call gb_Package_add_file,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar)) # vim: set noet sw=4 ts=4: diff --git a/hsqldb/Module_hsqldb.mk b/hsqldb/Module_hsqldb.mk index ef31358d3fcb..87726211f514 100644 --- a/hsqldb/Module_hsqldb.mk +++ b/hsqldb/Module_hsqldb.mk @@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,hsqldb)) ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,hsqldb,\ + ExternalPackage_hsqldb \ ExternalProject_hsqldb \ - Package_hsqldb \ UnpackedTarball_hsqldb \ )) endif |