changeset 1060:25ae2149b923

Merge
author lana
date Wed, 07 May 2014 21:31:50 -0700
parents 548afd249638 389603b4000d
children 12a1fd80b05a
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/Javadoc.gmk	Wed May 07 10:58:03 2014 -0700
+++ b/make/Javadoc.gmk	Wed May 07 21:31:50 2014 -0700
@@ -103,10 +103,7 @@
 DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
 
 # Url to copyright html file
-COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
-# This isn't added in old build yet.
-#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
-COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
+COPYRIGHT_URL = $(DOCSDIR_URL)/legal/cpyr.html
 
 # Url to bug filing site
 BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/