make/Images.gmk

*** 120,250 ****
  
  TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
  TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
  
  ################################################################################
- # /man dir
- #
- # All variables in this section are assigned with simple =, without :, to enable
- # more selective overriding from the custom version of this file.
- #
- # Avoid evaluating this whole section on windows for speed and stability
- ifneq ($(OPENJDK_TARGET_OS), windows)
-   ifeq ($(BUILD_MANPAGES), true)
-     JRE_MAN_PAGES += \
-         java.1 \
-         jjs.1 \
-         keytool.1 \
-         orbd.1 \
-         pack200.1 \
-         rmid.1 \
-         rmiregistry.1 \
-         servertool.1 \
-         unpack200.1
- 
-     JDK_MAN_PAGES += \
-         $(JRE_MAN_PAGES) \
-         idlj.1 \
-         jar.1 \
-         jarsigner.1 \
-         javac.1 \
-         javadoc.1 \
-         javap.1 \
-         jconsole.1 \
-         jcmd.1 \
-         jdb.1 \
-         jdeps.1 \
-         jinfo.1 \
-         jmap.1 \
-         jps.1 \
-         jrunscript.1 \
-         jstack.1 \
-         jstat.1 \
-         jstatd.1 \
-         rmic.1 \
-         serialver.1
- 
-     # This variable is potentially overridden in the closed makefile.
-     MAN_SRC_BASEDIR ?= $(TOPDIR)/src
- 
-     ifeq ($(OPENJDK_TARGET_OS), linux)
-       MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
-       MAN1_SUBDIR = man
-     endif
-     ifeq ($(OPENJDK_TARGET_OS), solaris)
-       MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/solaris/doc
-       MAN1_SUBDIR = sun/man/man1
-     endif
-     ifeq ($(OPENJDK_TARGET_OS), macosx)
-       MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/bsd/doc
-       MAN1_SUBDIR = man
-     endif
- 
-     $(JRE_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
-         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
- 
-     $(JDK_IMAGE_DIR)/man/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/%
-         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
- 
-     $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
-         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
- 
-     $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
-         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
- 
-     ifeq ($(OPENJDK_TARGET_OS), solaris)
-       $(JRE_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
-         $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
- 
-       $(JDK_IMAGE_DIR)/man/ja/man1/%: $(MAN_SRC_DIR)/$(MAN1_SUBDIR)/ja/%
-         $(call LogInfo, Converting $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(install-file)
-     endif
- 
-     ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
-       $(JRE_IMAGE_DIR)/man/ja:
-         $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
- 
-       $(JDK_IMAGE_DIR)/man/ja:
-         $(call LogInfo, Creating $(patsubst $(OUTPUTDIR)/%,%,$@))
-         $(CD) $(@D) && $(RM) ja && $(LN) -s ja_JP.UTF-8 ja
-     endif
- 
-     ifeq ($(OPENJDK_TARGET_OS), solaris)
-       JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
-           $(addprefix $(JRE_IMAGE_DIR)/man/ja/man1/, $(JRE_MAN_PAGES)) \
-           $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
-           $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JRE_MAN_PAGES))
- 
-       JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
-           $(addprefix $(JDK_IMAGE_DIR)/man/ja/man1/, $(JDK_MAN_PAGES)) \
-           $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
-           $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
-     endif
- 
-     ifneq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
-       JRE_MAN_PAGE_LIST = $(addprefix $(JRE_IMAGE_DIR)/man/man1/, $(JRE_MAN_PAGES)) \
-           $(addprefix $(JRE_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JRE_MAN_PAGES)) \
-           $(JRE_IMAGE_DIR)/man/ja
- 
-       JDK_MAN_PAGE_LIST = $(addprefix $(JDK_IMAGE_DIR)/man/man1/, $(JDK_MAN_PAGES)) \
-           $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.UTF-8/man1/, $(JDK_MAN_PAGES)) \
-           $(JDK_IMAGE_DIR)/man/ja
-     endif
- 
-     JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
-     JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
-   endif # BUILD_MANPAGES
- endif # Windows
- 
- ################################################################################
  # src.zip
  
  $(JDK_IMAGE_DIR)/lib/src.zip: $(SUPPORT_OUTPUTDIR)/src.zip
          $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
          $(install-file)
--- 120,129 ----