aboutsummaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorandrew <none@none>2010-01-07 23:17:01 +0000
committerandrew <none@none>2010-01-07 23:17:01 +0000
commitbf301cd9db8744bb9e949a35644af28b92c81ffa (patch)
treeda9f715679d30deae4eaed555c5e946f969de9a6 /make
parentc72ba50bc7f79d7762e567a5b12db094f1f9a2db (diff)
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
Diffstat (limited to 'make')
-rw-r--r--make/Defs-internal.gmk8
1 files 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