changeset 6102:c4788be627ad

8014969: Use open man pages for non commercial builds Reviewed-by: tbell
author erikj
date Fri, 24 May 2013 08:59:40 +0200
parents bec4d7f840cf
children 34cf6b72042e
files make/common/Release.gmk
diffstat 1 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release.gmk	Thu May 23 17:16:02 2013 -0700
+++ b/make/common/Release.gmk	Fri May 24 08:59:40 2013 +0200
@@ -170,20 +170,12 @@
 endif
 
 ifeq ($(PLATFORM), solaris)
-  ifndef OPENJDK
-    MANBASEDIRS=$(CLOSED_SRC)/solaris/doc $(IMPORTDOCDIR)
-  else
-    MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
-  endif
+  MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
   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
+  MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
   MAN1SUBDIR=man
   JA_DIRNAME=ja_JP.UTF-8
 endif # linux
@@ -1239,7 +1231,6 @@
 define echo-java-info
 $(CAT) $1
 endef
--include $(JDK_TOPDIR)/make/closed/common/release.gmk
 
 # Values to emit
 MINIMUM_OS_NAME    := $(REQUIRED_OS_NAME)
@@ -1436,3 +1427,4 @@
 # Force rule
 FRC:
 
+-include $(JDK_TOPDIR)/make/closed/common/release.gmk