From c66d80c2d50a92457980e1a830c666e8af2e04e0 Mon Sep 17 00:00:00 2001 From: Igor Nekrestyanov Date: Wed, 1 Sep 2010 09:36:38 -0700 Subject: [PATCH] 6981436: Variable gets hidden if Defs-javadoc is included Reviewed-by: ohair --- jdk/make/common/shared/Defs-javadoc.gmk | 2 +- jdk/make/docs/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/make/common/shared/Defs-javadoc.gmk b/jdk/make/common/shared/Defs-javadoc.gmk index 83b3b4aa706..a5ffe8e285e 100644 --- a/jdk/make/common/shared/Defs-javadoc.gmk +++ b/jdk/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
Redwood Shores, CA 94065 USA. diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile index a2aaccb130f..960c99947f3 100644 --- a/jdk/make/docs/Makefile +++ b/jdk/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