Mercurial > hg > release > icedtea6-1.4.1
changeset 1288:a530e095f65b
2008-12-19 Omair Majid <omajid@redhat.com>
Merged changes
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Fri, 19 Dec 2008 09:39:44 -0500 |
parents | 557ccffda8c5 (current diff) a58b6b3002c2 (diff) |
children | c10244d778ac |
files | ChangeLog |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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