summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-02-26 14:57:06 +0100
committerDavid Tardon <dtardon@redhat.com>2013-02-26 15:24:53 +0100
commit38c8b84c7f3e20c77ab87c7082c21e7bc44d82dc (patch)
treeb80a7bfb7ef031fffb1965e24a89b342fdaf4671
parentf094641d3ad1be5f2b09c2ed9c63fd6e18bd6799 (diff)
allow to create non-delivered Zip targets
Change-Id: I3496d815d4f2fedf04ca2c1727f37362c7395296
-rw-r--r--solenv/gbuild/Zip.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index a5226157d768..89ca8a694741 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -72,11 +72,16 @@ $(call gb_Zip__get_preparation_target,%) :
# the zip package target requires that all added files have a common root directory (package location)
# names of added files are relative to it; the zip will store them with their complete relative path name
# the location can't be stored in a scoped variable as it is needed in the add_file macro (see rule above)
-define gb_Zip_Zip_internal
+define gb_Zip_Zip_internal_nodeliver
$(call gb_Zip_get_target,$(1)) : FILES :=
$(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
$(call gb_Zip_get_clean_target,$(1)) : CLEAR_LOCATION :=
-gb_Package_Location_$(1) := $(2)
+$(eval gb_Package_Location_$(1) := $(2))
+
+endef
+
+define gb_Zip_Zip_internal
+$(call gb_Zip_Zip_internal_nodeliver,$(1),$(2))
$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1))
$(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1)) \