common/makefiles/Jprt.gmk

*** 199,210 ****
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
  
  ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
!   SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR)
!   SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR)
  else
    SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
    SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
  endif
  SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
--- 199,210 ----
          $(MKDIR) -p $(@D)
          $(RM) $@
          $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
  
  ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
!   SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
!   SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
  else
    SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
    SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
  endif
  SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
*** 213,226 ****
  # Bundle up the images
  bundles: all bundles-only
  bundles-only: start-make
          @$(call TargetEnter)
          $(MKDIR) -p $(BUILD_OUTPUT)/bundles
!         $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
!         $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
          if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
!            $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
          fi
          @$(call TargetExit)
  
  # Copy images to one unified location regardless of platform etc.
  final-images: all final-images-only
--- 213,226 ----
  # Bundle up the images
  bundles: all bundles-only
  bundles-only: start-make
          @$(call TargetEnter)
          $(MKDIR) -p $(BUILD_OUTPUT)/bundles
!         $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
!         $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
          if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
!            $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
          fi
          @$(call TargetExit)
  
  # Copy images to one unified location regardless of platform etc.
  final-images: all final-images-only