[Libreoffice-commits] core.git: solenv/gbuild

[David Tardon]

 solenv/gbuild/Package.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1591194a5fc45cbd44c0f4cb022d8ff8c88e0a24
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 14 17:04:50 2013 +0200

    gb_Package_add_files _can_ take empty list of files
    
    Change-Id: I5cc555de3f9b329b7bea6ea31b1689c2033a0904

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 5c40e60..e2306fe 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