提交 d3ea0eb3 编写于 作者: O ohair

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places

Reviewed-by: mchung, herrick
上级 05725320
...@@ -64,7 +64,7 @@ COPYRIGHT_SYMBOL = &\#x00a9; ...@@ -64,7 +64,7 @@ COPYRIGHT_SYMBOL = &\#x00a9;
# Macro to construct the copyright line # Macro to construct the copyright line
# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81) # (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
define CopyrightLine # optionalurl optionalfirstyear optionaladdress define CopyrightLine # optionalurl optionalfirstyear optionaladdress
$(if $(strip $1),<a href=\"$(strip $1)\">Copyright</a>,Copyright) \ $(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\ $(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
$(FULL_COMPANY_NAME). $3 All rights reserved. $(FULL_COMPANY_NAME). $3 All rights reserved.
endef endef
......
...@@ -113,7 +113,7 @@ ifeq ($(PLATFORM), linux) ...@@ -113,7 +113,7 @@ ifeq ($(PLATFORM), linux)
ALSA_INCLUDE=/usr/include/alsa/version.h ALSA_INCLUDE=/usr/include/alsa/version.h
ALSA_LIBRARY=/usr/lib/libasound.so ALSA_LIBRARY=/usr/lib/libasound.so
_ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
$(SED) -e 's@.*\"\(.*\)\".*@\1@' ) $(SED) -e 's@.*"\(.*\)".*@\1@' )
ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
endif endif
...@@ -333,12 +333,12 @@ sane-locale: ...@@ -333,12 +333,12 @@ sane-locale:
ifneq ($(PLATFORM), windows) ifneq ($(PLATFORM), windows)
@if [ "$(LC_ALL)" != "" -a "$(LC_ALL)" != "C" ]; then \ @if [ "$(LC_ALL)" != "" -a "$(LC_ALL)" != "C" ]; then \
$(ECHO) "WARNING: LC_ALL has been set to $(LC_ALL), this can cause build failures. \n" \ $(ECHO) "WARNING: LC_ALL has been set to $(LC_ALL), this can cause build failures. \n" \
" Try setting LC_ALL to \"C\". \n" \ " Try setting LC_ALL to 'C'. \n" \
"" >> $(WARNING_FILE) ; \ "" >> $(WARNING_FILE) ; \
fi fi
@if [ "$(LANG)" != "" -a "$(LANG)" != "C" ]; then \ @if [ "$(LANG)" != "" -a "$(LANG)" != "C" ]; then \
$(ECHO) "WARNING: LANG has been set to $(LANG), this can cause build failures. \n" \ $(ECHO) "WARNING: LANG has been set to $(LANG), this can cause build failures. \n" \
" Try setting LANG to \"C\". \n" \ " Try setting LANG to 'C'. \n" \
"" >> $(WARNING_FILE) ; \ "" >> $(WARNING_FILE) ; \
fi fi
endif endif
...@@ -1327,9 +1327,9 @@ ifdef LINK_VER ...@@ -1327,9 +1327,9 @@ ifdef LINK_VER
fi fi
@if [ "$(LINK_CHECK)" != "same" ]; then \ @if [ "$(LINK_CHECK)" != "same" ]; then \
$(ECHO) "WARNING: To build Java 2 SDK $(JDK_VERSION) you need : \n" \ $(ECHO) "WARNING: To build Java 2 SDK $(JDK_VERSION) you need : \n" \
" $(REQUIRED_COMPILER_VERSION) - link.exe version \"$(REQUIRED_LINK_VER)\" \n" \ " $(REQUIRED_COMPILER_VERSION) - link.exe version '$(REQUIRED_LINK_VER)' \n" \
" Specifically the $(REQUIRED_COMPILER_NAME) link.exe. \n " \ " Specifically the $(REQUIRED_COMPILER_NAME) link.exe. \n " \
" $(YOU_ARE_USING) Linker version \"$(LINK_VER)\" \n" \ " $(YOU_ARE_USING) Linker version '$(LINK_VER)' \n" \
"" >> $(WARNING_FILE) ; \ "" >> $(WARNING_FILE) ; \
fi fi
endif endif
......
此差异已折叠。
...@@ -83,7 +83,7 @@ RELEASE_DIR = $(OUTPUTDIR)/jce-release ...@@ -83,7 +83,7 @@ RELEASE_DIR = $(OUTPUTDIR)/jce-release
define release-warning define release-warning
@$(ECHO) \ @$(ECHO) \
"\n***The jar files built by the \"release\" target must***" \ "\n***The jar files built by the 'release' target must***" \
"\n***still be checked into the closed workspace! ***" \ "\n***still be checked into the closed workspace! ***" \
$(README-MAKEFILE_WARNING) $(README-MAKEFILE_WARNING)
endef endef
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册