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

From-SVN: r42207

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4bb315f44be4825dfa5fd7233be40cacf30bf071..d960f1b65ad71502ea168a9122f09d490040db96 100644 (file)
--- 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 3760b32c1020c3ddbf523df133a40d84c2dfd248..f659f97b844a9490444f479d51b39888446a140c 100644 (file)
--- 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 2002567e72f782bc5b4225dcb4a89639811afd6b..5e5635b642c6e4ab58177143ae77a138cbf2817d 100644 (file)
--- 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 = \