summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-02-25 09:15:58 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-06 10:31:30 +0100
commit35750371f7ecf65523caf031099aadf0ef14462e (patch)
treea8e46306544a4f3782c71c4fcb725821ec0eb3f1 /solenv
parent371efa17fa22d1eeac89a6977f0ba734a612ab9a (diff)
fix adding files to extension's root dir
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Extension.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index c9cf8848f7ca..49186c17f866 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -147,9 +147,10 @@ endef
#
# This function avoids the need to specify each file's name twice. The
# files are added directly under specified path in the extension,
-# without any subpath.
+# without any subpath. If no path is specified, they are added directly
+# to the root dir of the extension.
define gb_Extension_add_files
-$(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
+$(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip $(2))/)$(notdir $(file)),$(file)))
endef