changeset 45:87ed6cf2fb89 jdk6-b18

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, darcy
author andrew
date Fri, 08 Jan 2010 18:28:38 +0000
parents 3307d11b8026
children e5ffce975060
files make/jdk-rules.gmk
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/jdk-rules.gmk	Sun Mar 09 15:47:58 2008 -0700
+++ b/make/jdk-rules.gmk	Fri Jan 08 18:28:38 2010 +0000
@@ -36,11 +36,13 @@
   IMAGES_TARGET = images
 endif
 
-# No DOCS build when JDK_UPDATE_VERSION set
-ifdef JDK_UPDATE_VERSION
-  DOCS_TARGET =
-else
-  DOCS_TARGET = docs
+DOCS_TARGET = docs
+
+# No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
+ifndef OPENJDK
+  ifdef JDK_UPDATE_VERSION
+    DOCS_TARGET =
+  endif
 endif
 
 # NO_DOCS may be set in conjunction with DEV_ONLY