changeset 171:432cbbdc44bc

6914986: Make sure openjdk doc generation not turned off with JDK_UPDATE_VERSION Summary: Only turn off documentation for updates when not building OpenJDK Reviewed-by: ohair
author andrew
date Thu, 07 Jan 2010 23:17:01 +0000
parents 20aeeb517139
children a3242906c774
files make/Defs-internal.gmk
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/Defs-internal.gmk	Thu Dec 17 14:10:19 2009 -0800
+++ b/make/Defs-internal.gmk	Thu Jan 07 23:17:01 2010 +0000
@@ -231,9 +231,11 @@
 ifndef NO_DOCS
   # Default value (we want javadoc run)
   GENERATE_DOCS=true
-  # No DOCS build when JDK_UPDATE_VERSION set
-  ifdef JDK_UPDATE_VERSION
-    GENERATE_DOCS=false
+  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
+  ifndef OPENJDK
+    ifdef JDK_UPDATE_VERSION
+      GENERATE_DOCS=false
+    endif
   endif
   # If langtools, corba, jaxp, and jaxws are not being built, 
   #   a full jdk javadoc is not possible