changeset in /hg/icedtea6: 2008-12-09 Andrew John Hughes <gnu_...

[Andrew John Hughes]

changeset 4f248bc51029 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4f248bc51029
description:
	2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Remove the HotSpot directory while extracting
		OpenJDK and then only when HSBUILD is not original.

diffstat:

2 files changed, 15 insertions(+), 4 deletions(-)
ChangeLog   |    6 ++++++
Makefile.am |   13 +++++++++----

diffs (41 lines):

diff -r 30c77d225ff7 -r 4f248bc51029 ChangeLog
--- a/ChangeLog	Wed Dec 17 12:02:26 2008 -0500
+++ b/ChangeLog	Wed Dec 17 18:03:57 2008 +0000
@@ -1,3 +1,9 @@ 2008-12-17  Gary Benson  <gbenson at redhat
+2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Remove the HotSpot directory while extracting
+	OpenJDK and then only when HSBUILD is not original.
+	
 2008-12-17  Gary Benson  <gbenson at redhat.com>
 
 	* contrib/mixtec-hacks.patch: Updated.
diff -r 30c77d225ff7 -r 4f248bc51029 Makefile.am
--- a/Makefile.am	Wed Dec 17 12:02:26 2008 -0500
+++ b/Makefile.am	Wed Dec 17 18:03:57 2008 +0000
@@ -687,15 +687,20 @@ else
 	  mkdir openjdk ; \
 	  $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
 	  chmod -R ug+w openjdk ; \
+	  if test "x${HSBUILD}" != "xoriginal"; then \
+	    rm -rf openjdk/hotspot ; \
+	  fi ; \
 	  sh $(abs_top_srcdir)/fsg.sh ; \
 	fi
 if WITH_ALT_HSBUILD
 	if test -e ${HOTSPOT_SRC_ZIP} ; \
 	then \
-	  rm -rf openjdk/hotspot ; \
-	  $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
-	  chmod -R ug+w hotspot-* ; \
-	  mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \
+	  if ! test -d openjdk/hotspot ; \
+	  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 ; \
+	  fi ; \
 	fi
 endif
 endif