changeset in /hg/icedtea6: 2008-05-23 Lillian Angel <langel at re...

[Lillian Angel]

changeset 39145184c656 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=39145184c656
description:
	2008-05-23  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Updated jtreg to use correct javac and jar.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 9 insertions(+), 4 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    4 ++--
Makefile.in |    4 ++--

diffs (44 lines):

diff -r 707fd0557fda -r 39145184c656 ChangeLog
--- a/ChangeLog	Thu May 22 12:25:20 2008 -0400
+++ b/ChangeLog	Fri May 23 16:42:24 2008 -0400
@@ -1,3 +1,8 @@ 2008-05-22  Lillian Angel  <langel at redha
+2008-05-23  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Updated jtreg to use correct javac and jar.
+	* Makefile.in: Regenerated.
+
 2008-05-22  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Fixed conditions for using JAVAC.
diff -r 707fd0557fda -r 39145184c656 Makefile.am
--- a/Makefile.am	Thu May 22 12:25:20 2008 -0400
+++ b/Makefile.am	Fri May 23 16:42:24 2008 -0400
@@ -933,10 +933,10 @@ stamps/jtreg.stamp:
 stamps/jtreg.stamp:
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
-	bootstrap/icedtea/bin/javac -g -d test/jtreg/classes -source 1.5 \
+	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
 		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
 	(cd test/jtreg; \
-	 ../../bootstrap/icedtea/bin/jar cfm ../jtreg.jar \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \
diff -r 707fd0557fda -r 39145184c656 Makefile.in
--- a/Makefile.in	Thu May 22 12:25:20 2008 -0400
+++ b/Makefile.in	Fri May 23 16:42:24 2008 -0400
@@ -1369,10 +1369,10 @@ stamps/jtreg.stamp:
 stamps/jtreg.stamp:
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
-	bootstrap/icedtea/bin/javac -g -d test/jtreg/classes -source 1.5 \
+	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
 		 -encoding iso-8859-1 `find test/jtreg/com -name '*.java'`
 	(cd test/jtreg; \
-	 ../../bootstrap/icedtea/bin/jar cfm ../jtreg.jar \
+	 $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../jtreg.jar \
 		META-INF/MANIFEST.MF \
 		legal  README JavaTest.cmdMgrs.lst JavaTest.toolMgrs.lst \
 		`find com -type f -a -not -name '*.java'` \