changeset 2453:df239221d512

8171932: unresolved macro in javadoc command Reviewed-by: tbell
author erikj
date Tue, 10 Jan 2017 11:28:25 +0100
parents 4650659a4f55
children 8cddd16d59ee
files make/Javadoc.gmk make/common/MakeBase.gmk
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/Javadoc.gmk	Tue Jan 10 11:23:59 2017 +0100
+++ b/make/Javadoc.gmk	Tue Jan 10 11:28:25 2017 +0100
@@ -86,7 +86,7 @@
     DRAFT_WINDOW_TITLE_MARKER := $(SPACE)[build $(VERSION_BUILD)]
   endif
   EARLYACCESS_TOP := \
-      <div style="background-color: $$(HASH)EEEEEE"><div style="padding: 6px; \
+      <div style="background-color: $(HASH)EEEEEE"><div style="padding: 6px; \
       margin-top: 2px; margin-bottom: 6px; margin-left: 6px; margin-right: \
       6px; text-align: justify; font-size: 80%; font-family: Helvetica, Arial, \
       sans-serif; font-weight: normal;">Please note that the specifications \
--- a/make/common/MakeBase.gmk	Tue Jan 10 11:23:59 2017 +0100
+++ b/make/common/MakeBase.gmk	Tue Jan 10 11:28:25 2017 +0100
@@ -435,7 +435,7 @@
       Too many named arguments to macro, please update MAX_PARAMS in MakeBase.gmk))
   # Iterate over 2 3 4... and evaluate the named parameters with $1_ as prefix
   $(foreach i,$(PARAM_SEQUENCE), $(if $(strip $($i)),\
-    $(strip $1)_$(strip $(call DoubleDollar, $($i))))$(NEWLINE))
+    $(strip $1)_$(strip $(call EscapeHash, $(call DoubleDollar, $($i))))$(NEWLINE)))
   # Debug print all named parameter names and values
   $(if $(findstring $(LOG_LEVEL),debug trace), \
     $(info $0 $(strip $1) $(foreach i,$(PARAM_SEQUENCE), \