Merge

Wed, 07 May 2014 21:31:50 -0700

author
lana
date
Wed, 07 May 2014 21:31:50 -0700
changeset 1040
25ae2149b923
parent 1037
548afd249638
parent 1039
389603b4000d
child 1041
12a1fd80b05a

Merge

     1.1 --- a/make/Javadoc.gmk	Wed May 07 10:58:03 2014 -0700
     1.2 +++ b/make/Javadoc.gmk	Wed May 07 21:31:50 2014 -0700
     1.3 @@ -103,10 +103,7 @@
     1.4  DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
     1.5  
     1.6  # Url to copyright html file
     1.7 -COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
     1.8 -# This isn't added in old build yet.
     1.9 -#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
    1.10 -COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
    1.11 +COPYRIGHT_URL = $(DOCSDIR_URL)/legal/cpyr.html
    1.12  
    1.13  # Url to bug filing site
    1.14  BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/

mercurial