From 84a558756f751d975da860844f64b24d4a8a037f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= Date: Sat, 1 Oct 2011 02:54:37 +0200 Subject: [PATCH] adjust Zip.mk so we can copy files from other places to workdir and pack them --- solenv/gbuild/Zip.mk | 7 +++++++ 1 file changed, 7 insertions(+) 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