make/common/Release.gmk

*** 168,191 ****
  ifndef OPENJDK
    JDK_MAN_PAGES += jvisualvm.1
  endif
  
  ifeq ($(PLATFORM), solaris)
-   ifndef OPENJDK
-     MANBASEDIRS=$(CLOSED_SRC)/solaris/doc $(IMPORTDOCDIR)
-   else
      MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
-   endif
    MAN1SUBDIR=sun/man/man1
  endif # solaris
  
  ifeq ($(PLATFORM), linux)
-   ifndef OPENJDK
-     MANBASEDIRS=$(CLOSED_SRC)/linux/doc $(IMPORTDOCDIR)
-   else
      MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
-   endif
    MAN1SUBDIR=man
    JA_DIRNAME=ja_JP.UTF-8
  endif # linux
  
  define copy-man-pages
--- 168,183 ----
*** 1237,1247 ****
  endef
  
  define echo-java-info
  $(CAT) $1
  endef
- -include $(JDK_TOPDIR)/make/closed/common/release.gmk
  
  # Values to emit
  MINIMUM_OS_NAME    := $(REQUIRED_OS_NAME)
  MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
  MINIMUM_OS_ARCH    := $(ARCH)
--- 1229,1238 ----
*** 1434,1438 ****
--- 1425,1430 ----
          images-clobber
  
  # Force rule
  FRC:
  
+ -include $(JDK_TOPDIR)/make/closed/common/release.gmk