changeset 1062:12a1fd80b05a jdk8u20-b15

Merge
author lana
date Wed, 14 May 2014 10:59:39 -0700
parents e16ec7a7aa93 25ae2149b923
children 4095a7a49a9e f044e9413347
files
diffstat 1 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/Javadoc.gmk	Tue May 13 23:17:33 2014 -0700
+++ b/make/Javadoc.gmk	Wed May 14 10:59:39 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/