/hg/icedtea6: Use full path to jar application to avoid relying ...

[xranby at icedtea.classpath.org]

changeset 7674917fa451 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7674917fa451
author: Xerxes R?nby <xerxes at zafena.se>
date: Tue Jun 01 11:38:30 2010 +0200

	Use full path to jar application to avoid relying on the one on the
	path.

	2010-06-01 Xerxes R?nby <xerxes at zafena.se>

	 * Makefile.am: (extra-lib/about.jar): Remove
	redundant conditional that we don't need any more.
	(rewrite-rhino.stamp): Use full path to jar application to
	avoid relying on the one on the path.


diffstat:

2 files changed, 11 insertions(+), 7 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |    9 ++-------

diffs (42 lines):

diff -r cf45c29fbe48 -r 7674917fa451 ChangeLog
--- a/ChangeLog	Fri May 28 17:46:51 2010 +0100
+++ b/ChangeLog	Tue Jun 01 11:38:30 2010 +0200
@@ -1,3 +1,12 @@ 2010-05-28 Andrew John Hughes  <ahughes@
+2010-06-01  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	* Makefile.am:
+	(extra-lib/about.jar): Remove redundant 
+	conditional that we don't need any more.
+	(rewrite-rhino.stamp): Use full path to
+	jar application to avoid relying on the one
+	on the path.
+
 2010-05-28 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r cf45c29fbe48 -r 7674917fa451 Makefile.am
--- a/Makefile.am	Fri May 28 17:46:51 2010 +0100
+++ b/Makefile.am	Tue Jun 01 11:38:30 2010 +0200
@@ -1618,12 +1618,7 @@ clean-extra:
 	rm -f extra-source-files.txt
 
 extra-lib/about.jar: stamps/extra-class-files.stamp
-	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
-	then \
-	  $(JAR) cf $@ -C extra-lib net ; \
-	else \
-	  $(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
-	fi
+	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ;
 
 # PulseAudio based mixer
 # (pulse-java)
@@ -1701,7 +1696,7 @@ stamps/rewrite-rhino.stamp: stamps/rewri
 stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
 if WITH_RHINO
 	mkdir -p rhino/rhino.{old,new} && \
-	(cd rhino/rhino.old ; jar xf $(RHINO_JAR)) && \
+	(cd rhino/rhino.old ; $(ICEDTEA_BOOT_DIR)/bin/jar xf $(RHINO_JAR)) && \
 	$(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
 	  com.redhat.rewriter.ClassRewriter \
 	  $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \