6981436: Variable gets hidden if Defs-javadoc is included

Reviewed-by: ohair

6981436: Variable gets hidden if Defs-javadoc is included
Reviewed-by: ohair
40270ef8 · igor · 2e30f6ae · 40270ef8 · 40270ef8
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

make/common/shared/Defs-javadoc.gmk make/common/shared/Defs-javadoc.gmk +1 -1

make/docs/Makefile make/docs/Makefile +1 -1

未找到文件。
--- a/make/common/shared/Defs-javadoc.gmk
+++ b/make/common/shared/Defs-javadoc.gmk
@@ -45,7 +45,7 @@ JNLP_FIRST_COPYRIGHT_YEAR           = 1998
 PLUGIN2_FIRST_COPYRIGHT_YEAR        = 2007

 # Oracle name
-COMPANY_NAME = Oracle and/or its affiliates
+FULL_COMPANY_NAME = Oracle and/or its affiliates

 # Copyright address
 COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.

--- a/make/docs/Makefile
+++ b/make/docs/Makefile
@@ -57,7 +57,7 @@ JLS3_URL = http://java.sun.com/docs/books/jls/

 # Common Java trademark line
 JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
-$(COMPANY_NAME) in the US and other countries.
+$(FULL_COMPANY_NAME) in the US and other countries.

 #
 # Definitions for imported components