1.1 --- a/common/autoconf/spec.gmk.in Tue Jan 01 14:13:18 2013 +0100 1.2 +++ b/common/autoconf/spec.gmk.in Wed Jan 02 11:29:29 2013 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 # 1.9 # This code is free software; you can redistribute it and/or modify it 1.10 @@ -163,8 +163,7 @@ 1.11 1.12 # Different version strings generated from the above information. 1.13 JDK_VERSION:=@JDK_VERSION@ 1.14 -RUNTIME_NAME:=@RUNTIME_NAME@ 1.15 -JRE_RELEASE_VERSION:=@FULL_VERSION@ 1.16 +RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) 1.17 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ 1.18 # These variables need to be generated here so that MILESTONE and 1.19 # JDK_BUILD_NUMBER can be overridden on the make command line. 1.20 @@ -179,6 +178,7 @@ 1.21 else 1.22 FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) 1.23 endif 1.24 +JRE_RELEASE_VERSION:=$(FULL_VERSION) 1.25 1.26 # How to compile the code: release, fastdebug or slowdebug 1.27 DEBUG_LEVEL:=@DEBUG_LEVEL@ 1.28 @@ -451,10 +451,13 @@ 1.29 # CD is going away, but remains to cater for legacy makefiles. 1.30 CD:=cd 1.31 CHMOD:=@CHMOD@ 1.32 +COMM:=@COMM@ 1.33 CP:=@CP@ 1.34 +CPIO:=@CPIO@ 1.35 CUT:=@CUT@ 1.36 DATE:=@DATE@ 1.37 DIFF:=@DIFF@ 1.38 +DIRNAME:=@DIRNAME@ 1.39 FIND:=@FIND@ 1.40 FIND_DELETE:=@FIND_DELETE@ 1.41 ECHO:=@ECHO@ 1.42 @@ -479,6 +482,7 @@ 1.43 TIME:=@TIME@ 1.44 TR:=@TR@ 1.45 TOUCH:=@TOUCH@ 1.46 +UNIQ:=@UNIQ@ 1.47 WC:=@WC@ 1.48 XARGS:=@XARGS@ 1.49 ZIPEXE:=@ZIP@