From 116c9f8cc57c50c5b8206999897f0567673b9ae4 Mon Sep 17 00:00:00 2001 From: bpatel Date: Mon, 2 May 2011 10:14:27 -0700 Subject: [PATCH] 6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg --- jdk/make/docs/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile index f2ed1a8fae..9a5a1aa29b 100644 --- a/jdk/make/docs/Makefile +++ b/jdk/make/docs/Makefile @@ -51,6 +51,7 @@ DEV_DOCS_URL-5 = http://java.sun.com/j2se/1.5.0/docs/index.html 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 @@ COMMON_JAVADOCFLAGS = \ -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 -- GitLab