1.1 --- a/common/autoconf/spec.gmk.in Sun Dec 30 12:15:02 2012 +0100
1.2 +++ b/common/autoconf/spec.gmk.in Tue Jan 01 14:13:18 2013 +0100
1.3 @@ -164,10 +164,21 @@
1.4 # Different version strings generated from the above information.
1.5 JDK_VERSION:=@JDK_VERSION@
1.6 RUNTIME_NAME:=@RUNTIME_NAME@
1.7 -FULL_VERSION:=@FULL_VERSION@
1.8 JRE_RELEASE_VERSION:=@FULL_VERSION@
1.9 -RELEASE:=@RELEASE@
1.10 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
1.11 +# These variables need to be generated here so that MILESTONE and
1.12 +# JDK_BUILD_NUMBER can be overridden on the make command line.
1.13 +ifeq ($(MILESTONE),)
1.14 + RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
1.15 +else
1.16 + RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
1.17 +endif
1.18 +ifeq ($(JDK_BUILD_NUMBER),b00)
1.19 + USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@
1.20 + FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER)
1.21 +else
1.22 + FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
1.23 +endif
1.24
1.25 # How to compile the code: release, fastdebug or slowdebug
1.26 DEBUG_LEVEL:=@DEBUG_LEVEL@
