OpenJDK / jdk7 / jdk7 / jdk
changeset 2835:ea7e333308ed
6981436: Variable gets hidden if Defs-javadoc is included
Reviewed-by: ohair
| author | igor |
|---|---|
| date | Wed, 01 Sep 2010 09:36:38 -0700 |
| parents | 6841ece60936 |
| children | 72136d9a079f |
| files | make/common/shared/Defs-javadoc.gmk make/docs/Makefile |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Defs-javadoc.gmk Fri Aug 20 14:48:10 2010 -0400 +++ b/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/make/docs/Makefile Fri Aug 20 14:48:10 2010 -0400 +++ b/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