changeset 1807:8826d5735e2c icedtea6-1.7-branchpoint

Set JDK_UPDATE_VERSION based on upstream drop version
author Deepak Bhole <dbhole@redhat.com>
date Tue, 22 Dec 2009 16:44:24 -0500
parents d48415f1ab6f
children 5dec35b43920 e3b8d810bf4c
files ChangeLog Makefile.am
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 22 11:42:03 2009 +0100
+++ b/ChangeLog	Tue Dec 22 16:44:24 2009 -0500
@@ -1,3 +1,7 @@
+2009-12-22  Deepak Bhole <dbhole@redhat.com>
+
+	* Makefile.am: Set JDK_UPDATE_VERSION based on upstream drop version
+
 2009-12-22  Gary Benson  <gbenson@redhat.com>
 
 	* contrib/checkopts/checkopts: New file.
--- a/Makefile.am	Tue Dec 22 11:42:03 2009 +0100
+++ b/Makefile.am	Tue Dec 22 16:44:24 2009 -0500
@@ -373,7 +373,7 @@
   ICEDTEA_SHARK_BUILD =
 endif
 
-JDK_UPDATE_VERSION = 0
+JDK_UPDATE_VERSION = $(shell echo $(OPENJDK_VERSION) | sed -e "s/^b//")
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 ICEDTEA_ENV = \
 	IMPORT_BINARY_PLUGS=true \