Mercurial > hg > openjdk > lambda
changeset 150:a3242906c774 jdk7-b80
Merge
author | mikejwre |
---|---|
date | Wed, 20 Jan 2010 17:09:09 -0800 |
parents | b1952d19290d (current diff) 432cbbdc44bc (diff) |
children | 8403096d1fe7 |
files | |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Defs-internal.gmk Thu Jan 14 15:48:22 2010 -0800 +++ b/make/Defs-internal.gmk Wed Jan 20 17:09:09 2010 -0800 @@ -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