Mercurial > hg > release > icedtea6-1.2

changeset 871:39145184c656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-05-23 Lillian Angel <langel@redhat.com> * Makefile.am: Updated jtreg to use correct javac and jar. * Makefile.in: Regenerated.
author Lillian Angel <langel@redhat.com>
date Fri, 23 May 2008 16:42:24 -0400
parents 707fd0557fda
children d72271b9d9ef
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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-23  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Updated jtreg to use correct javac and jar.
+	* Makefile.in: Regenerated.
+
 2008-05-22  Lillian Angel  <langel@redhat.com>
 
 	* Makefile.am: Fixed conditions for using JAVAC.
--- 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:
 	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'` \
--- 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:
 	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'` \