From e8ab9adb4cbca3a8bbf138b41e7934736181afc5 Mon Sep 17 00:00:00 2001
From: sgehwolf <unknown>
Date: Tue, 19 May 2020 03:05:59 +0100
Subject: [PATCH] 8243059: Build fails when --with-vendor-name contains a comma
 Summary: Avoid early evaluation of COMPANY_NAME Reviewed-by: aph, andrew

---
 make/common/JavaCompilation.gmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index e474ea4..bc34720 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -222,7 +222,7 @@ define SetupArchive
 	$$($1_GREP_EXCLUDE_OUTPUT)
 	$$(if $$($1_MANIFEST), \
 	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
-	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
+	      -e "s#@@COMPANY_NAME@@#$$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
 	, \
 	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
 	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
-- 
GitLab