Package is replaceable by ExternalPackage

Change-Id: I6d46f4ae957576927432dca63a281a376ce15600

1 files changed, 11 insertions, 13 deletions

diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 5bf1f517acb5..f24a2caeed87 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -33,8 +33,6 @@ $(call gb_ExternalPackage_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),EPK,2)
 	rm -f $(call gb_ExternalPackage_get_target,$*)
 
-gb_ExternalPackage_get_packagename = External/$(1)
-
 # Create and register a new ExternalPackage
 #
 # The base directory of the package is the directory of the unpacked
@@ -55,12 +53,12 @@ endef
 #
 # gb_ExternalPackage_ExternalPackage_internal name unpacked
 define gb_ExternalPackage_ExternalPackage_internal
-$(call gb_Package_Package_internal,$(call gb_ExternalPackage_get_packagename,$(1)),$(call gb_UnpackedTarball_get_dir,$(2)))
-$(call gb_Package_use_unpacked,$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
+$(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
+$(call gb_Package_use_unpacked,$(1),$(2))
 
-$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_ExternalPackage_get_packagename,$(1)))
+$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
 $(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call gb_ExternalPackage_get_target,$(1))).dir
-$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_ExternalPackage_get_packagename,$(1)))
+$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1))
 
 gb_ExternalPackage_UNPACKED_$(1) := $(2)
 
@@ -72,7 +70,7 @@ endef
 #
 # gb_ExternalPackage_add_file package dest src
 define gb_ExternalPackage_add_file
-$(call gb_Package_add_file,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_file,$(1),$(2),$(3))
 
 endef
 
@@ -82,7 +80,7 @@ endef
 #
 # gb_ExternalPackage_add_files package destdir file(s)
 define gb_ExternalPackage_add_files
-$(call gb_Package_add_files,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files,$(1),$(2),$(3))
 
 endef
 
@@ -92,7 +90,7 @@ endef
 #
 # gb_ExternalPackage_add_files_with_dir package destdir file(s)
 define gb_ExternalPackage_add_files_with_dir
-$(call gb_Package_add_files_with_dir,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files_with_dir,$(1),$(2),$(3))
 
 endef
 
@@ -107,7 +105,7 @@ endef
 #
 # gb_ExternalPackage_add_unpacked_file package dest src
 define gb_ExternalPackage_add_unpacked_file
-$(call gb_Package_add_file,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_file,$(1),$(2),$(3))
 $(call gb_ExternalPackage__add_file,$(1),$(3))
 
 endef
@@ -123,7 +121,7 @@ endef
 #
 # gb_ExternalPackage_add_unpacked_files package destdir file(s)
 define gb_ExternalPackage_add_unpacked_files
-$(call gb_Package_add_files,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files,$(1),$(2),$(3))
 $(call gb_ExternalPackage__add_files,$(1),$(3))
 
 endef
@@ -134,7 +132,7 @@ endef
 #
 # gb_ExternalPackage_add_unpacked_files_with_dir package destdir file(s)
 define gb_ExternalPackage_add_unpacked_files_with_dir
-$(call gb_Package_add_files_with_dir,$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files_with_dir,$(1),$(2),$(3))
 $(call gb_ExternalPackage__add_files,$(1),$(3))
 
 endef
@@ -143,7 +141,7 @@ endef
 #
 # gb_ExternalPackage_use_external_project package external
 define gb_ExternalPackage_use_external_project
-$(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1),$(2)))
+$(call gb_Package_use_external_project,$(1),$(2))
 
 endef