8159628: Bundles contain extra /./ path element for all files
authorerikj
Tue, 21 Jun 2016 20:00:20 +0200
changeset 39111 d3f0656636f8
parent 39110 712f29ba8708
child 39112 3d27ea6a582e
8159628: Bundles contain extra /./ path element for all files Reviewed-by: tbell
make/Bundles.gmk
--- a/make/Bundles.gmk	Wed Jun 08 15:13:19 2016 +0200
+++ b/make/Bundles.gmk	Tue Jun 21 20:00:20 2016 +0200
@@ -52,7 +52,7 @@
 SetupBundleFile = $(NamedParamsMacroTemplate)
 define SetupBundleFileBody
 
-  $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, ./%, $$($1_FILES))
+  $1_RELATIVE_FILES := $$(patsubst $$($1_BASE_DIR)/%, %, $$($1_FILES))
 
   ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )
     $1_TYPE := tar.gz
@@ -71,7 +71,7 @@
 	$$(call MakeDir, $$(@D))
         ifneq ($$($1_SPECIAL_INCLUDES), )
 	  $$(foreach i, $$($1_SPECIAL_INCLUDES), \
-	      ($(CD) $$($1_BASE_DIR) && $(FIND) ./$$i \
+	      ($(CD) $$($1_BASE_DIR) && $(FIND) $$i \
 	          >> $(SUPPORT_OUTPUTDIR)/bundles/_$1_files ) ; )
         endif
         ifneq ($$($1_SUBDIR), )