From f1ed6c40bcf8384b78f3bc4e5c1e008f252ca1ba Mon Sep 17 00:00:00 2001
From: andrew <unknown>
Date: Thu, 7 Jan 2010 23:17:01 +0000
Subject: [PATCH] 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

---
 make/Defs-internal.gmk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index bf6e5a7..db30727 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -231,9 +231,11 @@ endif
 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
-- 
GitLab