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 /beanshell | |
| parent | 617d89384947223e41bf2ed613af247e2bb7db82 (diff) | |
copy external jars to instdir
Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec
Diffstat (limited to 'beanshell')
| -rw-r--r-- | beanshell/ExternalPackage_beanshell.mk (renamed from beanshell/Package_beanshell.mk) | 6 | ||||
| -rw-r--r-- | beanshell/Module_beanshell.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/beanshell/Package_beanshell.mk b/beanshell/ExternalPackage_beanshell.mk index bb4b829cce08..1346b889cbd0 100644 --- a/beanshell/Package_beanshell.mk +++ b/beanshell/ExternalPackage_beanshell.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell))) +$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell)) -$(eval $(call gb_Package_use_external_project,beanshell,beanshell)) +$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell)) -$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar)) # vim: set noet sw=4 ts=4: diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk index e739b3698ef6..035529aa4dec 100644 --- a/beanshell/Module_beanshell.mk +++ b/beanshell/Module_beanshell.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,beanshell)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter BSH,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,beanshell,\ + ExternalPackage_beanshell \ ExternalProject_beanshell \ - Package_beanshell \ UnpackedTarball_beanshell \ )) endif |