1.1 --- a/common/makefiles/Jprt.gmk Mon Jan 14 13:09:59 2013 +0100
1.2 +++ b/common/makefiles/Jprt.gmk Mon Jan 14 15:30:22 2013 +0100
1.3 @@ -26,7 +26,8 @@
1.4 # This file is included by the root NewerMakefile and contains targets
1.5 # and utilities needed by JPRT.
1.6
1.7 -# Utilities used in this Makefile
1.8 +# Utilities used in this Makefile. Most of this makefile executes without
1.9 +# the context of a spec file from configure.
1.10 CAT=cat
1.11 CMP=cmp
1.12 CP=cp
1.13 @@ -177,8 +178,13 @@
1.14 bundles: all
1.15 @$(call TargetEnter)
1.16 $(MKDIR) -p $(BUILD_OUTPUT)/bundles
1.17 - $(CD) $(IMAGES_OUTPUTDIR)/j2sdk-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
1.18 - $(CD) $(IMAGES_OUTPUTDIR)/j2re-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
1.19 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
1.20 + $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
1.21 + $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
1.22 +else
1.23 + $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
1.24 + $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
1.25 +endif
1.26 @$(call TargetExit)
1.27
1.28 # Keep track of phony targets
