Mercurial > hg > openjdk > jigsaw > jdk
changeset 7366:8dbb4b159e04
8013552: Add build support for different man pages for OpenJDK and OracleJDK
Reviewed-by: tbell, omajid
| author | erikj |
|---|---|
| date | Thu, 02 May 2013 15:59:32 +0200 |
| parents | 55c7b90fe57e |
| children | 053a0b46e437 |
| files | makefiles/Images.gmk |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/Images.gmk Wed May 01 14:59:55 2013 -0700 +++ b/makefiles/Images.gmk Thu May 02 15:59:32 2013 +0200 @@ -352,16 +352,22 @@ 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))