# HG changeset patch # User bpatel # Date 1304356467 25200 # Node ID 7304634c0ad7df925e143495a185a6e0553a2226 # Parent f5b408c1db04563a56b15b8ef000f17ccb4dbac9 6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg diff -r f5b408c1db04 -r 7304634c0ad7 jdk/make/docs/Makefile --- a/jdk/make/docs/Makefile Mon May 02 11:47:55 2011 +0100 +++ b/jdk/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