From b83ae7fb3882b387e03a1d069410214fbcfb272e Mon Sep 17 00:00:00 2001
From: erikj <unknown>
Date: Thu, 2 May 2013 15:59:32 +0200
Subject: [PATCH] 8013552: Add build support for different man pages for
 OpenJDK and OracleJDK Reviewed-by: tbell, omajid

---
 makefiles/Images.gmk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/makefiles/Images.gmk b/makefiles/Images.gmk
index 70a816145..2dde16fdf 100644
--- a/makefiles/Images.gmk
+++ b/makefiles/Images.gmk
@@ -352,16 +352,22 @@ ifneq ($(OPENJDK_TARGET_OS),windows)
         JDK_MAN_PAGES += jvisualvm.1
     endif
 
+    ifndef OPENJDK
+        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src/closed
+    else
+        MAN_SRC_BASEDIR:=$(JDK_TOPDIR)/src
+    endif
+
     ifeq ($(OPENJDK_TARGET_OS), linux)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/linux/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/linux/doc
         MAN1_SUBDIR:=man
     endif
     ifeq ($(OPENJDK_TARGET_OS), solaris)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/solaris/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/solaris/doc
         MAN1_SUBDIR:=sun/man/man1
     endif
     ifeq ($(OPENJDK_TARGET_OS), macosx)
-        MAN_SRC_DIR:=$(JDK_TOPDIR)/src/bsd/doc
+        MAN_SRC_DIR:=$(MAN_SRC_BASEDIR)/bsd/doc
         MAN1_SUBDIR:=man
         JDK_MAN_PAGES := $(filter-out jcmd.1, $(JDK_MAN_PAGES))
         JDK_MAN_PAGES := $(filter-out jvisualvm.1, $(JDK_MAN_PAGES))
-- 
GitLab