make/Bundles.gmk

*** 120,130 ****
  
  ################################################################################
  
  # On Macosx, we bundle up the macosx specific images which already have the
  # correct base directories.
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
    JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
    JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
    JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
    JDK_BUNDLE_SUBDIR :=
--- 120,130 ----
  
  ################################################################################
  
  # On Macosx, we bundle up the macosx specific images which already have the
  # correct base directories.
! ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
    JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
    JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
    JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
    JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
    JDK_BUNDLE_SUBDIR :=