FYI: Another distcheck fix

[Andrew John Hughes]

This fixes the path to jtreg.jar.  Hopefully the tests
will now run...

ChangeLog:

2008-07-01  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am: Move new aliases to end with others,
	and fix path of jtreg.jar.
	* Makefile.in: Regenerated.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 4cad9bad13c5 Makefile.am
--- a/Makefile.am	Tue Jul 01 14:31:40 2008 +0200
+++ b/Makefile.am	Tue Jul 01 14:15:35 2008 +0100
@@ -714,7 +714,6 @@ endif
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/icedtea.stamp
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
@@ -740,7 +739,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	mkdir -p stamps
 	touch stamps/icedtea.stamp
 
-icedtea-debug: stamps/icedtea-debug.stamp
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
@@ -1087,7 +1085,7 @@ stamps/jtreg.stamp: stamps/icedtea.stamp
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
 		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
 	(cd $(srcdir)/test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
@@ -1156,7 +1154,11 @@ extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp
 
+icedtea: stamps/icedtea.stamp
+
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
+
+icedtea-debug: stamps/icedtea-debug.stamp
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
diff -r 4cad9bad13c5 Makefile.in
--- a/Makefile.in	Tue Jul 01 14:31:40 2008 +0200
+++ b/Makefile.in	Tue Jul 01 14:15:35 2008 +0100
@@ -1157,7 +1157,6 @@ clean-bootstrap-directory-symlink-ecj:
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/icedtea.stamp
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
@@ -1183,7 +1182,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	mkdir -p stamps
 	touch stamps/icedtea.stamp
 
-icedtea-debug: stamps/icedtea-debug.stamp
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
@@ -1503,7 +1501,7 @@ stamps/jtreg.stamp: stamps/icedtea.stamp
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
 		 -encoding iso-8859-1 `find $(srcdir)/test/jtreg/com -name '*.java'`
 	(cd $(srcdir)/test/jtreg; \
-	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/jtreg.jar \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm $(abs_top_builddir)/test/jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
@@ -1571,7 +1569,11 @@ extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp
 
+icedtea: stamps/icedtea.stamp
+
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
+
+icedtea-debug: stamps/icedtea-debug.stamp
 
 icedtea-ecj: stamps/icedtea-ecj.stamp