Merge
diff --git a/make/common/Release.gmk b/make/common/Release.gmk
index 224dcd1..409a772 100644
--- a/make/common/Release.gmk
+++ b/make/common/Release.gmk
@@ -1100,7 +1100,7 @@
# Common way to emit a line into the release or info file
define info-file-item # name value
-$(PRINTF) "%s=\"%s\"\n" $1 $2 >> $@
+$(PRINTF) '%s="%s"\n' $1 $2 >> $@
endef
# Values to emit
diff --git a/make/common/shared/Defs-javadoc.gmk b/make/common/shared/Defs-javadoc.gmk
index a5ffe8e..a98542d 100644
--- a/make/common/shared/Defs-javadoc.gmk
+++ b/make/common/shared/Defs-javadoc.gmk
@@ -61,33 +61,11 @@
EMPTY:=
SPACE:=$(EMPTY) $(EMPTY)
COPYRIGHT_SYMBOL = &\#x00a9;
-# Macros to handle the optional empty args.
+# Macro to construct the copyright line
# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
-define OptionalCopyrightUrl # url
-$(shell \
- if [ "$1" != "" ] ; then \
- printf "<a href=\"%s\">Copyright</a>" "$1"; \
- else \
- printf "Copyright"; \
- fi)
-endef
-define OptionalCopyrightFirstYear # year
-$(shell \
- if [ "$1" != "" ] ; then \
- printf "%s," "$1";\
- fi)
-endef
-define OptionalCompanyAddress # address
-$(shell \
- if [ "$1" != "" ] ; then \
- printf "%s" "$1";\
- fi)
-endef
define CopyrightLine # optionalurl optionalfirstyear optionaladdress
-$(call OptionalCopyrightUrl,$1) $(COPYRIGHT_SYMBOL)\
-$(call OptionalCopyrightFirstYear,$2) $(COPYRIGHT_YEAR),\
-$(COMPANY_NAME).\
-$(call OptionalCompanyAddress,$3)\
-All rights reserved.
+$(if $(strip $1),<a href=\"$(strip $1)\">Copyright</a>,Copyright) \
+$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
+$(FULL_COMPANY_NAME). $3 All rights reserved.
endef
diff --git a/make/common/shared/Defs-utils.gmk b/make/common/shared/Defs-utils.gmk
index bb6aa49..cb93efc 100644
--- a/make/common/shared/Defs-utils.gmk
+++ b/make/common/shared/Defs-utils.gmk
@@ -135,6 +135,7 @@
UNIQ = $(UTILS_USR_BIN_PATH)uniq
UNZIP = $(UTILS_USR_BIN_PATH)unzip
UNZIPSFX = $(UTILS_DEVTOOL_PATH)unzipsfx
+XARGS = $(UTILS_USR_BIN_PATH)xargs
WC = $(UTILS_USR_BIN_PATH)wc
WHICH = $(UTILS_USR_BIN_PATH)which
YACC = $(UTILS_CCS_BIN_PATH)yacc
diff --git a/make/docs/Makefile b/make/docs/Makefile
index 98bf18b..0a2012f 100644
--- a/make/docs/Makefile
+++ b/make/docs/Makefile
@@ -166,7 +166,7 @@
# Common bottom argument
define CommonBottom # year
-<font size=\"-1\"><p> $(call CopyrightLine,,$1,)</font>
+<font size=\"-1\"><br> $(call CopyrightLine,,$1,)</font>
endef
# Common trademark bottom argument (Not sure why this is used sometimes)
@@ -183,7 +183,7 @@
see <a href=\"$(DEV_DOCS_URL)\" target=\"_blank\">Java SE Documentation</a>. \
That documentation contains more detailed, developer-targeted descriptions, \
with conceptual overviews, definitions of terms, workarounds, \
-and working code examples.<p>\
+and working code examples.<br>\
$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
</font>