Mercurial > hg > release > icedtea6-1.11
changeset 1942:abe692ba050f
Use full path to jar application when rewriting Rhino files.
2010-02-24 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(rewrite-rhino.stamp): Use full path to
jar application to avoid relying on the one
on the path.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 24 Feb 2010 20:56:59 +0000 |
parents | 04345d27c594 |
children | e0792821e2e7 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 24 20:22:15 2010 +0000 +++ b/ChangeLog Wed Feb 24 20:56:59 2010 +0000 @@ -1,3 +1,10 @@ +2010-02-24 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (rewrite-rhino.stamp): Use full path to + jar application to avoid relying on the one + on the path. + 2010-02-24 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Wed Feb 24 20:22:15 2010 +0000 +++ b/Makefile.am Wed Feb 24 20:56:59 2010 +0000 @@ -1705,7 +1705,6 @@ if ENABLE_PULSE_JAVA $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp - mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR) $(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \ -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $< @@ -1741,6 +1740,7 @@ touch stamps/pulse-java-class.stamp stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp + mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR) $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \ org.classpath.icedtea.pulseaudio.EventLoop ; \ $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \ @@ -1792,7 +1792,8 @@ sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \ done \ ) - (cd rhino/rhino.new ; jar cfm ../rhino.jar META-INF/MANIFEST.MF sun ) + (cd rhino/rhino.new ; \ + $(ICEDTEA_BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun ) endif mkdir -p stamps touch stamps/rewrite-rhino.stamp