From: Per Bothner <per@bothner.com>
Date: Thu, 17 May 2001 17:04:08 +0000 (-0700)
Subject: * Makefile.am (ZIP):  The "fastjar" binary is now plain "jar".
X-Git-Tag: prereleases/libstdc++-3.0.95~4404
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b2040e7b55b41fcec68c984678a08fc0267ad3c7;p=thirdparty%2Fgcc.git

* Makefile.am (ZIP):  The "fastjar" binary is now plain "jar".

From-SVN: r42207
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4bb315f44be4..d960f1b65ad7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-17  Per Bothner  <per@bothner.com>
+
+	* Makefile.am (ZIP):  The "fastjar" binary is now plain "jar".
+
 2001-05-16  Tom Tromey  <tromey@redhat.com>
 
 	* java/text/SimpleDateFormat.java (parse): Handle non-dst time
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 3760b32c1020..f659f97b844a 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -57,9 +57,9 @@ if CANADIAN
 if NULL_TARGET
 ## In this case, gcj is found outside the build tree.  However, zip is
 ## found in the build tree.
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 else
-ZIP = fastjar
+ZIP = jar
 endif
 GCJH = gcjh
 else # CANADIAN
@@ -68,7 +68,7 @@ else # CANADIAN
 ## definition of GCJ won't work; instead we resort to this ugly
 ## definition that gives us absolute paths.
 GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 endif # CANADIAN
 
 ## The compiler with whatever flags we want for both -c and -C
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 2002567e72f7..5e5635b642c6 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -148,11 +148,11 @@ data_DATA = libgcj.jar
 
 bin_SCRIPTS = addr2name.awk
 @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
-@CANADIAN_TRUE@@NULL_TARGET_FALSE@fastjar
+@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
 @CANADIAN_FALSE@ZIP = \
-@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar$(EXEEXT)
+@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
 @CANADIAN_TRUE@GCJH = \
 @CANADIAN_TRUE@gcjh
 @CANADIAN_FALSE@GCJH = \