Mercurial > hg > release > icedtea7-2.0
changeset 2183:a0d045c13c13
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 | Fri, 28 May 2010 17:29:01 +0100 |
| parents | cc07055da3e2 |
| children | 0b38b757f001 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 28 17:26:04 2010 +0100 +++ b/ChangeLog Fri May 28 17:29:01 2010 +0100 @@ -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 Fri May 28 17:26:04 2010 +0100 +++ b/Makefile.am Fri May 28 17:29:01 2010 +0100 @@ -2235,6 +2235,7 @@ touch $@ 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) \ @@ -2249,7 +2250,6 @@ touch $@ $(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 $< @@ -2301,7 +2301,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