changeset in /hg/icedtea: 2008-12-02 Matthias Klose <doko at ubun...

[doko at ubuntu.com]

changeset b7a8b3f766db in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=b7a8b3f766db
description:
	2008-12-02  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (stamps/extract.stamp): Fix extraction of
	        alternate hotspot tarball.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-

diffs (24 lines):

diff -r 88c610e6f50a -r b7a8b3f766db ChangeLog
--- a/ChangeLog	Tue Dec 02 17:05:33 2008 +0000
+++ b/ChangeLog	Tue Dec 02 19:20:50 2008 +0100
@@ -1,3 +1,8 @@ 2008-12-02  Lillian Angel  <langel at redha
+2008-12-02  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/extract.stamp): Fix extraction of
+	alternate hotspot tarball.
+
 2008-12-02  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am
diff -r 88c610e6f50a -r b7a8b3f766db Makefile.am
--- a/Makefile.am	Tue Dec 02 17:05:33 2008 +0000
+++ b/Makefile.am	Tue Dec 02 19:20:50 2008 +0100
@@ -630,7 +630,7 @@ stamps/extract.stamp: stamps/download.st
 	    rm -rf openjdk/hotspot ; \
 	    $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
 	    chmod -R ug+w hotspot-* ; \
-	    mv hotspot-* openjdk/hotspot ; \
+	    mv $$(find -maxdepth 1 -name 'hotspot-*' -type d) openjdk/hotspot ; \
 	  fi ; \
 	  sh $(abs_top_srcdir)/fsg.sh ; \
 	fi