summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-04-14 17:04:50 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-14 17:04:50 +0200
commit1591194a5fc45cbd44c0f4cb022d8ff8c88e0a24 (patch)
treec65127e10f628756e94902bbbbc0afc2348013fd /solenv
parent6fb3c3872c626efe740c850d9e89447a1d7ca053 (diff)
gb_Package_add_files _can_ take empty list of files
Change-Id: I5cc555de3f9b329b7bea6ea31b1689c2033a0904
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Package.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 5c40e603947b..e2306feef1b5 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -128,7 +128,7 @@ endef
# $(eval $(call gb_Package_add_files,foo_inc,inc/foo,foo/bar/foo.hxx))
# # -> inc/foo/foo.hxx
define gb_Package_add_files
-$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files requires 3 arguments))
+$(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. dir is missing)))
$(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
endef
@@ -142,7 +142,7 @@ endef
# $(eval $(call gb_Package_add_files,foo_inc,inc,foo/bar/foo.hxx))
# # -> inc/foo/bar/foo.hxx
define gb_Package_add_files_with_dir
-$(if $(strip $(3)),,$(call gb_Output_error,gb_Package_add_files_with_dir requires 3 arguments))
+$(if $(strip $(3)),,$(if $(filter 1,$(words $(2))),,$(call gb_Output_error,gb_Package_add_files: it looks like either pkg name or dest. dir is missing)))
$(foreach file,$(3),$(call gb_Package_add_file,$(1),$(2)/$(file),$(file)))
endef