gbuild: ExternalPackage: use gb_Helper_install

Change-Id: I001563c8aaf4e21e57c53aa2045b6709a35464d7

1 files changed, 10 insertions, 22 deletions

diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 4491b887fb95..7ec30cb57a29 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -36,9 +36,6 @@ $(call gb_ExternalPackage_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),EPK,2)
 	rm -f $(call gb_ExternalPackage_get_target,$*)
 
-# Get name of the Package used for delivering files for install to $(INSTDIR).
-gb_ExternalPackage_get_packagename = ExternalPackage/$(1)
-
 # Create and register a new ExternalPackage
 #
 # The base directory of the package is the directory of the unpacked
@@ -63,8 +60,6 @@ define gb_ExternalPackage_ExternalPackage_internal
 $(call gb_Package_Package_internal,$(1),$(call gb_UnpackedTarball_get_dir,$(2)))
 $(call gb_Package_use_unpacked,$(1),$(2))
 
-$(call gb_ExternalPackage__ExternalPackage_package,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-
 $(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,$(1))
@@ -73,14 +68,6 @@ gb_ExternalPackage_UNPACKED_$(1) := $(2)
 
 endef
 
-# gb_ExternalPackage__ExternalPackage_package package inst-package unpacked
-define gb_ExternalPackage__ExternalPackage_package
-$(call gb_Package_Package_internal,$(2),$(call gb_UnpackedTarball_get_dir,$(3)))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
-$(call gb_Package_use_unpacked,$(2),$(3))
-
-endef
-
 # Set output dir for the package's files.
 #
 # Default is $(OUTDIR).
@@ -197,20 +184,21 @@ endef
 define gb_ExternalPackage_use_external_project
 $(call gb_Package_use_external_project,$(1),$(2))
 
-$(call gb_Package_use_external_project,$(call gb_ExternalPackage_get_packagename,$(1)),$(2))
-
 $(if $(gb_ExternalPackage_PROJECT_$(1)),$(call gb_Output_error,gb_ExternalPackage_use_external_project: only one project allowed))
 gb_ExternalPackage_PROJECT_$(1) := $(2)
 
 endef
 
-# gb_ExternalPackage__add_file_for_install package package-inst dest dest-inst src
+# gb_ExternalPackage__add_file_for_install package dest dest-inst src
 define gb_ExternalPackage__add_file_for_install
-$(call gb_ExternalPackage_add_file,$(1),$(3),$(5))
+$(call gb_ExternalPackage_add_file,$(1),$(2),$(4))
+
+$(call gb_Helper_install,$(call gb_ExternalPackage_get_target,$(1)), \
+	$(INSTDIR)/$(3), \
+	$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4))
 
-$(call gb_ExternalPackage_add_file,$(2),$(4),$(5))
-$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
-$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
+$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \
+	$(call gb_Package_get_preparation_target,$(1))
 
 endef
 
@@ -225,7 +213,7 @@ endef
 #
 # gb_ExternalPackage_add_library_for_install package dest src library?
 define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
 
 endef
 
@@ -245,7 +233,7 @@ endef
 #
 # gb_ExternalPackage_add_jar_for_install package dest src
 define gb_ExternalPackage_add_jar_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
 
 endef