summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-10-01 02:54:37 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2011-10-01 17:26:07 +0200
commit84a558756f751d975da860844f64b24d4a8a037f (patch)
tree06ff0133d5cdd36ff6d07219985cc497f6720052 /solenv
parentc11d61eec93b6bae3f4e106f4a8e4c8f895a99bc (diff)
adjust Zip.mk so we can copy files from other places to workdir and pack them
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Zip.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index a96ff6be8ede..f6d492ed9c6d 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -81,10 +81,17 @@ endef
# adding a file creates a dependency to it
# the full path name of the file needs access to the package location
# as scoped variables only exist in rules, we use a postfixed name to refer to the location
+# if package location is in $(WORKDIR) we can specify third parameter and copy file from different place
define gb_Zip_add_file
$(call gb_Zip_get_target,$(1)) : FILES += $(2)
$(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
$(gb_Package_Location_$(1))/$(2) :| $(call gb_Zip__get_preparation_target,$(1))
+ifneq ($(3),)
+$(gb_Package_Location_$(1))/$(2) : $(3)
+ mkdir -p $$(dir $$@)
+ cp -f $$< $$@
+
+endif
endef