Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6981436: Variable gets hidden if Defs-javadoc is included
authorigor
Wed, 01 Sep 2010 09:36:38 -0700
changeset 6787 648846ff9d14
parent 6786 08f72406f403
child 6788 7b6911d709ed
6981436: Variable gets hidden if Defs-javadoc is included Reviewed-by: ohair
jdk/make/common/shared/Defs-javadoc.gmk file | annotate | diff | comparison | revisions
jdk/make/docs/Makefile file | annotate | diff | comparison | revisions 
--- a/jdk/make/common/shared/Defs-javadoc.gmk	Fri Aug 20 14:48:10 2010 -0400
+++ b/jdk/make/common/shared/Defs-javadoc.gmk	Wed Sep 01 09:36:38 2010 -0700
@@ -45,7 +45,7 @@
 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/jdk/make/docs/Makefile	Fri Aug 20 14:48:10 2010 -0400
+++ b/jdk/make/docs/Makefile	Wed Sep 01 09:36:38 2010 -0700
@@ -57,7 +57,7 @@
 
 # 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
jdk-sandbox