changeset 1191:853db8b9e476

Fixed man pages in images again
author erikj
date Mon, 22 Sep 2014 11:33:39 +0200
parents ce31454f86d8
children 59eff3df1313
files make/Images.gmk
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/make/Images.gmk	Fri Sep 19 17:27:00 2014 +0200
+++ b/make/Images.gmk	Mon Sep 22 11:33:39 2014 +0200
@@ -32,6 +32,10 @@
 JDK_TARGETS := 
 JRE_TARGETS :=
 
+# Override locations for these for now
+JDK_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/jdk
+JRE_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/jre
+
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, , Images.gmk))
 
@@ -94,10 +98,6 @@
     $(MODULES_XML)
     #
 
-# Override locations for these for now
-JDK_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/jdk
-JRE_IMAGE_DIR := $(IMAGES_OUTPUTDIR)/jre
-
 $(IMAGES_OUTPUTDIR)/_jdk-jimages-create.marker: $(DEPENDENCIES)
 	$(ECHO) Creating jdk-jimage
 	$(RM) -r $(JDK_IMAGE_DIR)
@@ -255,7 +255,7 @@
         $(addprefix $(JDK_IMAGE_DIR)/man/ja_JP.PCK/man1/, $(JDK_MAN_PAGES))
   endif
 
-  ifeq ($(findstring $(OPENJDK_TARGET_OS), linux macosx), )
+  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
@@ -265,8 +265,8 @@
         $(JDK_IMAGE_DIR)/man/ja
   endif
 
-  JRE_TARGETS += $(JRE_MAN_PAGES_LIST)
-  JDK_TARGETS += $(JDK_MAN_PAGES_LIST)
+  JRE_TARGETS += $(JRE_MAN_PAGE_LIST)
+  JDK_TARGETS += $(JDK_MAN_PAGE_LIST)
 endif # Windows
 
 ################################################################################