1.1 --- a/make/common/Release.gmk	Tue Mar 08 14:26:17 2011 -0800
     1.2 +++ b/make/common/Release.gmk	Tue Mar 08 16:05:16 2011 -0800
     1.3 @@ -1098,7 +1098,7 @@
     1.4  
     1.5  # Common way to emit a line into the release or info file
     1.6  define info-file-item # name value
     1.7 -$(PRINTF) "%s=\"%s\"\n" $1 $2 >> $@
     1.8 +$(PRINTF) '%s="%s"\n' $1 $2 >> $@
     1.9  endef
    1.10  
    1.11  # Values to emit

     2.1 --- a/make/common/shared/Defs-javadoc.gmk	Tue Mar 08 14:26:17 2011 -0800
     2.2 +++ b/make/common/shared/Defs-javadoc.gmk	Tue Mar 08 16:05:16 2011 -0800
     2.3 @@ -61,33 +61,11 @@
     2.4  EMPTY:=
     2.5  SPACE:=$(EMPTY) $(EMPTY)
     2.6  COPYRIGHT_SYMBOL = &\#x00a9;
     2.7 -# Macros to handle the optional empty args.
     2.8 +# Macro to construct the copyright line
     2.9  #   (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
    2.10 -define OptionalCopyrightUrl # url
    2.11 -$(shell \
    2.12 -  if [ "$1" != "" ] ; then \
    2.13 -    printf "<a href=\"%s\">Copyright</a>" "$1"; \
    2.14 -  else \
    2.15 -    printf "Copyright"; \
    2.16 -  fi)
    2.17 -endef
    2.18 -define OptionalCopyrightFirstYear # year
    2.19 -$(shell \
    2.20 -  if [ "$1" != "" ] ; then \
    2.21 -    printf "%s," "$1";\
    2.22 -  fi)
    2.23 -endef
    2.24 -define OptionalCompanyAddress # address
    2.25 -$(shell \
    2.26 -  if [ "$1" != "" ] ; then \
    2.27 -    printf "%s" "$1";\
    2.28 -  fi)
    2.29 -endef
    2.30  define CopyrightLine # optionalurl optionalfirstyear optionaladdress
    2.31 -$(call OptionalCopyrightUrl,$1) $(COPYRIGHT_SYMBOL)\
    2.32 -$(call OptionalCopyrightFirstYear,$2) $(COPYRIGHT_YEAR),\
    2.33 -$(COMPANY_NAME).\
    2.34 -$(call OptionalCompanyAddress,$3)\
    2.35 -All rights reserved.
    2.36 +$(if $(strip $1),<a href=\"$(strip $1)\">Copyright</a>,Copyright) \
    2.37 +$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
    2.38 +$(FULL_COMPANY_NAME). $3 All rights reserved.
    2.39  endef
    2.40  

     3.1 --- a/make/common/shared/Defs-utils.gmk	Tue Mar 08 14:26:17 2011 -0800
     3.2 +++ b/make/common/shared/Defs-utils.gmk	Tue Mar 08 16:05:16 2011 -0800
     3.3 @@ -115,7 +115,6 @@
     3.4  PKGMK          = $(UTILS_COMMAND_PATH)pkgmk
     3.5  PRINTF         = $(UTILS_USR_BIN_PATH)printf
     3.6  PWD            = $(UTILS_COMMAND_PATH)pwd
     3.7 -RC             = $(UTILS_COMMAND_PATH)rc
     3.8  READELF        = $(UTILS_USR_BIN_PATH)readelf
     3.9  RMDIR          = $(UTILS_COMMAND_PATH)rmdir
    3.10  RPM            = $(UTILS_COMMAND_PATH)rpm
    3.11 @@ -135,6 +134,7 @@
    3.12  UNIQ           = $(UTILS_USR_BIN_PATH)uniq
    3.13  UNZIP          = $(UTILS_USR_BIN_PATH)unzip
    3.14  UNZIPSFX       = $(UTILS_DEVTOOL_PATH)unzipsfx
    3.15 +XARGS          = $(UTILS_USR_BIN_PATH)xargs
    3.16  WC             = $(UTILS_USR_BIN_PATH)wc
    3.17  WHICH          = $(UTILS_USR_BIN_PATH)which
    3.18  YACC           = $(UTILS_CCS_BIN_PATH)yacc

     4.1 --- a/make/common/shared/Sanity.gmk	Tue Mar 08 14:26:17 2011 -0800
     4.2 +++ b/make/common/shared/Sanity.gmk	Tue Mar 08 16:05:16 2011 -0800
     4.3 @@ -1012,11 +1012,6 @@
     4.4  	    "" >> $(ERROR_FILE) ; \
     4.5  	fi
     4.6    else
     4.7 -    ifeq ($(wildcard $(REBASE)),)
     4.8 -	@$(ECHO) "ERROR: Cannot find the REBASE utility from path: $(REBASE)\n" \
     4.9 -	    "      This is normally obtained from the WINDOWSSDKDIR." \
    4.10 -	    "" >> $(ERROR_FILE)
    4.11 -    endif
    4.12      ifeq ($(wildcard $(RC)),)
    4.13  	@$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \
    4.14  	    "      This is normally obtained from the WINDOWSSDKDIR." \
    4.15 @@ -1024,7 +1019,7 @@
    4.16      endif
    4.17      ifeq ($(wildcard $(DUMPBIN)),)
    4.18  	@$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
    4.19 -	    "      This is normally obtained from the WINDOWSSDKDIR." \
    4.20 +	    "      This is normally obtained from the COMPILER_PATH." \
    4.21  	    "" >> $(ERROR_FILE)
    4.22      endif
    4.23    endif

     5.1 --- a/make/docs/Makefile	Tue Mar 08 14:26:17 2011 -0800
     5.2 +++ b/make/docs/Makefile	Tue Mar 08 16:05:16 2011 -0800
     5.3 @@ -166,7 +166,7 @@
     5.4  
     5.5  # Common bottom argument
     5.6  define CommonBottom # year
     5.7 -<font size=\"-1\"><p> $(call CopyrightLine,,$1,)</font>
     5.8 +<font size=\"-1\"><br> $(call CopyrightLine,,$1,)</font>
     5.9  endef
    5.10  
    5.11  # Common trademark bottom argument (Not sure why this is used sometimes)
    5.12 @@ -183,7 +183,7 @@
    5.13  see <a href=\"$(DEV_DOCS_URL)\" target=\"_blank\">Java SE Documentation</a>. \
    5.14  That documentation contains more detailed, developer-targeted descriptions, \
    5.15  with conceptual overviews, definitions of terms, workarounds, \
    5.16 -and working code examples.<p>\
    5.17 +and working code examples.<br>\
    5.18  $(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
    5.19  </font>
    5.20