Merge jdk7-b80

Wed, 20 Jan 2010 17:09:09 -0800

author
mikejwre
date
Wed, 20 Jan 2010 17:09:09 -0800
changeset 152
a3242906c774
parent 150
b1952d19290d
parent 151
432cbbdc44bc
child 153
8403096d1fe7

Merge

     1.1 --- a/make/Defs-internal.gmk	Thu Jan 14 15:48:22 2010 -0800
     1.2 +++ b/make/Defs-internal.gmk	Wed Jan 20 17:09:09 2010 -0800
     1.3 @@ -231,9 +231,11 @@
     1.4  ifndef NO_DOCS
     1.5    # Default value (we want javadoc run)
     1.6    GENERATE_DOCS=true
     1.7 -  # No DOCS build when JDK_UPDATE_VERSION set
     1.8 -  ifdef JDK_UPDATE_VERSION
     1.9 -    GENERATE_DOCS=false
    1.10 +  # No DOCS build when JDK_UPDATE_VERSION set on non-OPENJDK builds
    1.11 +  ifndef OPENJDK
    1.12 +    ifdef JDK_UPDATE_VERSION
    1.13 +      GENERATE_DOCS=false
    1.14 +    endif
    1.15    endif
    1.16    # If langtools, corba, jaxp, and jaxws are not being built, 
    1.17    #   a full jdk javadoc is not possible

mercurial