# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1229697584 18000
# Node ID a530e095f65b86239b34b937e40df579eb931b9d
# Parent  557ccffda8c5d3eeac0cb7a91a92b6d23b00df94# Parent  a58b6b3002c2045a52150c3211897cd09f534b14
2008-12-19  Omair Majid  <omajid@redhat.com>

    Merged changes

diff -r 557ccffda8c5 -r a530e095f65b ChangeLog
--- a/ChangeLog	Fri Dec 19 09:35:19 2008 -0500
+++ b/ChangeLog	Fri Dec 19 09:39:44 2008 -0500
@@ -6,6 +6,7 @@
 2008-12-19  Andrew Haley  <aph@redhat.com>
 
 	* Makefile.am (stamps/download.stamp): Check MD5sum on hotspot.tar.gz.
+	(stamps/extract.stamp): Use AWK here rather than cut.
 	* hotspot.map: Add md5sum for 14.0b08.
 
 2008-12-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
diff -r 557ccffda8c5 -r a530e095f65b Makefile.am
--- a/Makefile.am	Fri Dec 19 09:35:19 2008 -0500
+++ b/Makefile.am	Fri Dec 19 09:39:44 2008 -0500
@@ -709,7 +709,8 @@
 	  then \
 	    $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
 	    chmod -R ug+w hotspot-* ; \
-	    mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \
+	    mv hotspot-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \
+	      $(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
 	  fi ; \
 	fi
 endif