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 /rhino | |
| parent | 617d89384947223e41bf2ed613af247e2bb7db82 (diff) | |
copy external jars to instdir
Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec
Diffstat (limited to 'rhino')
| -rw-r--r-- | rhino/ExternalPackage_rhino.mk (renamed from rhino/Package_rhino.mk) | 6 | ||||
| -rw-r--r-- | rhino/Module_rhino.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rhino/Package_rhino.mk b/rhino/ExternalPackage_rhino.mk index 075c49c8a401..45ccf14c894a 100644 --- a/rhino/Package_rhino.mk +++ b/rhino/ExternalPackage_rhino.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,rhino,$(call gb_UnpackedTarball_get_dir,rhino))) +$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino)) -$(eval $(call gb_Package_use_external_project,rhino,rhino)) +$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino)) -$(eval $(call gb_Package_add_file,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) +$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar)) # vim: set noet sw=4 ts=4: diff --git a/rhino/Module_rhino.mk b/rhino/Module_rhino.mk index 5fccae447cea..d63ee3f3e973 100644 --- a/rhino/Module_rhino.mk +++ b/rhino/Module_rhino.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,rhino)) ifneq ($(SOLAR_JAVA),) ifneq ($(filter RHINO,$(BUILD_TYPE)),) $(eval $(call gb_Module_add_targets,rhino,\ + ExternalPackage_rhino \ ExternalProject_rhino \ - Package_rhino \ UnpackedTarball_rhino \ )) endif |