common/makefiles/Jprt.gmk

*** 175,186 ****
  
  # This target must be called in the context of a SPEC file
  bundles: all
          @$(call TargetEnter)
          $(MKDIR) -p $(BUILD_OUTPUT)/bundles
!         $(CD) $(IMAGES_OUTPUTDIR)/j2sdk-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
!         $(CD) $(IMAGES_OUTPUTDIR)/j2re-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
          @$(call TargetExit)
  
  # Keep track of phony targets
  PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
                jprt_build_generic bundles jprt_bundle
--- 175,191 ----
  
  # This target must be called in the context of a SPEC file
  bundles: all
          @$(call TargetEnter)
          $(MKDIR) -p $(BUILD_OUTPUT)/bundles
! ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
!         $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
!         $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
! else
!         $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
!         $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
! endif
          @$(call TargetExit)
  
  # Keep track of phony targets
  PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
                jprt_build_generic bundles jprt_bundle