common/autoconf/flags.m4

*** 97,113 ****
      # in a custom configure script, or possibly the command line.
      # Let those variables be expanded at make time in spec.gmk.
      # The \$ are escaped to the shell, and the $(...) variables
      # are evaluated by make.
      RC_FLAGS="$RC_FLAGS \
!         -D\"JDK_BUILD_ID=\$(FULL_VERSION)\" \
          -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
          -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
!         -D\"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
          -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
!         -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
!         -D\"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
    fi
    AC_SUBST(RC_FLAGS)
  
    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # silence copyright notice and other headers.
--- 97,113 ----
      # in a custom configure script, or possibly the command line.
      # Let those variables be expanded at make time in spec.gmk.
      # The \$ are escaped to the shell, and the $(...) variables
      # are evaluated by make.
      RC_FLAGS="$RC_FLAGS \
!         -D\"JDK_VERSION_STRING=\$(VERSION_STRING)\" \
          -D\"JDK_COMPANY=\$(COMPANY_NAME)\" \
          -D\"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
!         -D\"JDK_VER=\$(VERSION_NUMBER_FOUR_POSITIONS)\" \
          -D\"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
!         -D\"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(VERSION_MAJOR)\" \
!         -D\"JDK_FVER=\$(subst .,\$(COMMA),\$(VERSION_NUMBER_FOUR_POSITIONS))\""
    fi
    AC_SUBST(RC_FLAGS)
  
    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # silence copyright notice and other headers.
*** 634,647 ****
      fi
    else
      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DDEBUG"
    fi
  
-   # Setup release name
-   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
- 
- 
    # Set some additional per-OS defines.
    if test "x$OPENJDK_TARGET_OS" = xmacosx; then
      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
    elif test "x$OPENJDK_TARGET_OS" = xaix; then
      # FIXME: PPC64 should not be here.
--- 634,643 ----