Mercurial > hg > release > icedtea7-forest-2.4 > jdk
changeset 4320:c678b0cf5f92
6553182: Need to modify javadoc doclet for GPL
Reviewed-by: jjg
author | bpatel |
---|---|
date | Mon, 02 May 2011 10:14:27 -0700 |
parents | aee65a629245 |
children | fa17f2b9a6d5 |
files | make/docs/Makefile |
diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/docs/Makefile Mon May 02 11:47:55 2011 +0100 +++ b/make/docs/Makefile Mon May 02 10:14:27 2011 -0700 @@ -51,6 +51,7 @@ DEV_DOCS_URL-6 = http://download.oracle.com/javase/6/docs/index.html DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION)) +DOCS_BASE_URL = http://download.oracle.com/javase/7/docs # Url to Java Language Spec #JLS3_URL = http://java.sun.com/docs/books/jls/ @@ -205,7 +206,13 @@ -use \ -keywords \ $(ADDITIONAL_JAVADOCFLAGS) -ADDITIONAL_JAVADOCFLAGS = + +ifdef OPENJDK + ADDITIONAL_JAVADOCFLAGS = \ + -Xdocrootparent $(DOCS_BASE_URL) +else + ADDITIONAL_JAVADOCFLAGS = +endif # Draft used for non-fcs documents JDK_IS_FCS = false