make/MacBundles.gmk

*** 35,49 ****
  
    # JDK_MACOSX_BUNDLE_DIR and JRE_MACOSX_BUNDLE_DIR are defined in SPEC.
  
    MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
  
!   BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(JDK_MINOR_VERSION)u$(JDK_UPDATE_VERSION)
!   BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_MINOR_VERSION)
!   BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(JDK_VERSION)
!   BUNDLE_PLATFORM_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION)
!   BUNDLE_VERSION := $(JDK_VERSION)
    ifeq ($(COMPANY_NAME), N/A)
      BUNDLE_VENDOR := UNDEFINED
    else
      BUNDLE_VENDOR := $(COMPANY_NAME)
    endif
--- 35,49 ----
  
    # JDK_MACOSX_BUNDLE_DIR and JRE_MACOSX_BUNDLE_DIR are defined in SPEC.
  
    MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
  
!   BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT)
!   BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT)
!   BUNDLE_INFO := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_STRING)
!   BUNDLE_PLATFORM_VERSION := $(VERSION_MAJOR).$(VERSION_MINOR)
!   BUNDLE_VERSION := $(VERSION_NUMBER)
    ifeq ($(COMPANY_NAME), N/A)
      BUNDLE_VENDOR := UNDEFINED
    else
      BUNDLE_VENDOR := $(COMPANY_NAME)
    endif