changeset 1000:eda060dc8e89

Merge
author coffeys
date Fri, 31 Jan 2014 00:14:30 +0000
parents 5a681b1f428d 4f590c2cec75
children 1a13916186e4
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/THIRD_PARTY_README	Thu Jan 23 20:42:36 2014 +0000
+++ b/THIRD_PARTY_README	Fri Jan 31 00:14:30 2014 +0000
@@ -1400,7 +1400,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Little CMS 2.4, which may be 
-included with OpenJDK 8.
+included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
--- a/common/autoconf/spec.gmk.in	Thu Jan 23 20:42:36 2014 +0000
+++ b/common/autoconf/spec.gmk.in	Fri Jan 31 00:14:30 2014 +0000
@@ -170,7 +170,7 @@
 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
 # These variables need to be generated here so that MILESTONE and
 # JDK_BUILD_NUMBER can be overridden on the make command line.
-ifeq ($(MILESTONE),)
+ifeq ($(MILESTONE), fcs)
   RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
 else
   RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)