1.1 --- a/common/autoconf/toolchain.m4 Fri Jun 28 12:02:37 2013 +0200
1.2 +++ b/common/autoconf/toolchain.m4 Mon Jul 01 15:40:27 2013 +0200
1.3 @@ -369,17 +369,20 @@
1.4 AS_IF([test "x$VARIANT" = xOPT], [
1.5 RC_FLAGS="$RC_FLAGS -d NDEBUG"
1.6 ])
1.7 - JDK_UPDATE_VERSION_NOTNULL=$JDK_UPDATE_VERSION
1.8 - AS_IF([test "x$JDK_UPDATE_VERSION" = x], [
1.9 - JDK_UPDATE_VERSION_NOTNULL=0
1.10 - ])
1.11 - RC_FLAGS="$RC_FLAGS -d \"JDK_BUILD_ID=$FULL_VERSION\""
1.12 - RC_FLAGS="$RC_FLAGS -d \"JDK_COMPANY=$COMPANY_NAME\""
1.13 - RC_FLAGS="$RC_FLAGS -d \"JDK_COMPONENT=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME binary\""
1.14 - RC_FLAGS="$RC_FLAGS -d \"JDK_VER=$JDK_MINOR_VERSION.$JDK_MICRO_VERSION.$JDK_UPDATE_VERSION_NOTNULL.$COOKED_BUILD_NUMBER\""
1.15 - RC_FLAGS="$RC_FLAGS -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\""
1.16 - RC_FLAGS="$RC_FLAGS -d \"JDK_NAME=$PRODUCT_NAME $JDK_RC_PLATFORM_NAME $JDK_MINOR_VERSION $JDK_UPDATE_META_TAG\""
1.17 - RC_FLAGS="$RC_FLAGS -d \"JDK_FVER=$JDK_MINOR_VERSION,$JDK_MICRO_VERSION,$JDK_UPDATE_VERSION_NOTNULL,$COOKED_BUILD_NUMBER\""
1.18 +
1.19 + # The version variables used to create RC_FLAGS may be overridden
1.20 + # in a custom configure script, or possibly the command line.
1.21 + # Let those variables be expanded at make time in spec.gmk.
1.22 + # The \$ are escaped to the shell, and the $(...) variables
1.23 + # are evaluated by make.
1.24 + RC_FLAGS="$RC_FLAGS \
1.25 + -d \"JDK_BUILD_ID=\$(FULL_VERSION)\" \
1.26 + -d \"JDK_COMPANY=\$(COMPANY_NAME)\" \
1.27 + -d \"JDK_COMPONENT=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) binary\" \
1.28 + -d \"JDK_VER=\$(JDK_MINOR_VERSION).\$(JDK_MICRO_VERSION).\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0).\$(COOKED_BUILD_NUMBER)\" \
1.29 + -d \"JDK_COPYRIGHT=Copyright \xA9 $COPYRIGHT_YEAR\" \
1.30 + -d \"JDK_NAME=\$(PRODUCT_NAME) \$(JDK_RC_PLATFORM_NAME) \$(JDK_MINOR_VERSION) \$(JDK_UPDATE_META_TAG)\" \
1.31 + -d \"JDK_FVER=\$(JDK_MINOR_VERSION),\$(JDK_MICRO_VERSION),\$(if \$(JDK_UPDATE_VERSION),\$(JDK_UPDATE_VERSION),0),\$(COOKED_BUILD_NUMBER)\""
1.32
1.33 # lib.exe is used to create static libraries.
1.34 AC_CHECK_PROG([WINAR], [lib],[lib],,,)
