1.1 --- a/make/common/Defs.gmk	Mon Mar 21 11:42:38 2011 -0700
     1.2 +++ b/make/common/Defs.gmk	Tue Mar 22 12:12:31 2011 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -488,6 +488,10 @@
    1.11    COPYRIGHT_YEAR := $(shell $(DATE) '+%Y')
    1.12  endif
    1.13  
    1.14 +ifndef OPENJDK
    1.15 +include $(JDK_TOPDIR)/make/closed/common/Defs.gmk
    1.16 +endif
    1.17 +
    1.18  # Install of imported file (JDK_IMPORT_PATH, or some other external location)
    1.19  define install-importonly-file
    1.20  @$(ECHO) "ASSEMBLY_IMPORT: $@"

     2.1 --- a/make/common/Release.gmk	Mon Mar 21 11:42:38 2011 -0700
     2.2 +++ b/make/common/Release.gmk	Tue Mar 22 12:12:31 2011 -0700
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -86,14 +86,7 @@
    2.11    IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
    2.12    IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
    2.13  else
    2.14 -  # Where to find these files
    2.15 -  ifeq ($(J4B), true)
    2.16 -      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdkfb
    2.17 -      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jrefb
    2.18 -  else
    2.19 -      SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
    2.20 -      SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
    2.21 -  endif
    2.22 +  # make/closed/common/Defs.gmk for closed location of SHARE_JDK_DOC_SRC
    2.23  
    2.24    IMAGE_DOCLIST_JDK = COPYRIGHT README.html  THIRDPARTYLICENSEREADME.txt
    2.25    IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt