From 7be41495c20e5814ee09c6643864abef5def1933 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Tue, 21 Jun 2016 20:00:20 +0200
Subject: [PATCH] 8159628: Bundles contain extra /./ path element for all files

Reviewed-by: tbell
---
 make/Bundles.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 376cd315866..84b7afc2b76 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -52,7 +52,7 @@ $(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
 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 @@ define SetupBundleFileBody
 	$$(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), )