jdk/make/launcher/LauncherCommon.gmk

*** 162,174 ****
        SRC := $(LAUNCHER_SRC), \
        INCLUDE_FILES := main.c, \
        OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \
        CFLAGS := $$($1_CFLAGS) \
            $(LAUNCHER_CFLAGS) \
!           -DFULL_VERSION='"$(FULL_VERSION)"' \
!           -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
!           -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
            -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' $(DPACKAGEPATH) \
            $2, \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
--- 162,172 ----
        SRC := $(LAUNCHER_SRC), \
        INCLUDE_FILES := main.c, \
        OPTIMIZATION := $$($1_OPTIMIZATION_ARG), \
        CFLAGS := $$($1_CFLAGS) \
            $(LAUNCHER_CFLAGS) \
!           $(VERSION_CFLAGS) \
            -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
            -DPROGNAME='"$1"' $(DPACKAGEPATH) \
            $2, \
        CFLAGS_linux := -fPIC, \
        CFLAGS_solaris := -KPIC -DHAVE_GETHRTIME, \
*** 196,206 ****
            -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
            -D "JDK_INTERNAL_NAME=$1" \
            -D "JDK_FTYPE=0x1L" \
            $7, \
        MANIFEST := $(JAVA_MANIFEST), \
!       MANIFEST_VERSION := $(JDK_VERSION_FOR_MANIFEST), \
        CODESIGN := $$($1_CODESIGN), \
    )
  
    TARGETS += $$(BUILD_LAUNCHER_$1)
  
--- 194,204 ----
            -D "JDK_FNAME=$1$(EXE_SUFFIX)" \
            -D "JDK_INTERNAL_NAME=$1" \
            -D "JDK_FTYPE=0x1L" \
            $7, \
        MANIFEST := $(JAVA_MANIFEST), \
!       MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
        CODESIGN := $$($1_CODESIGN), \
    )
  
    TARGETS += $$(BUILD_LAUNCHER_$1)