changeset 5771:2f5d66a7d930

Merge
author tbell
date Thu, 14 Feb 2013 22:17:30 +0000
parents 81e936460bc9 2b405fdb2a6d
children dc53b95a5db7
files
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Release.gmk	Thu Feb 14 22:49:55 2013 +0400
+++ b/make/common/Release.gmk	Thu Feb 14 22:17:30 2013 +0000
@@ -171,12 +171,20 @@
 endif
 
 ifeq ($(PLATFORM), solaris)
-  MANBASEDIRS=$(JDK_TOPDIR)/src/solaris/doc $(IMPORTDOCDIR)
+  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)
-  MANBASEDIRS=$(JDK_TOPDIR)/src/linux/doc $(IMPORTDOCDIR)
+  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