From 03296d1c22a05defd0ad10620369df3e88658505 Mon Sep 17 00:00:00 2001
From: Jeff Sturm <jsturm@one-point.com>
Date: Fri, 30 Aug 2002 23:08:52 +0000
Subject: [PATCH] Makefile.in: Rebuilt.

2002-08-30  Jeff Sturm  <jsturm@one-point.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (ZIP, GCJH): Remove $(EXEEXT).

From-SVN: r56690
---
 libjava/ChangeLog   | 5 +++++
 libjava/Makefile.am | 6 +++---
 libjava/Makefile.in | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 33c9bb40fc09..c64f9ea30348 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-30  Jeff Sturm  <jsturm@one-point.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (ZIP, GCJH): Remove $(EXEEXT).
+
 2002-08-29  Tom Tromey  <tromey@redhat.com>
 
 	* java/net/JarURLConnection.java (getCertificates): New method
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index ef10fe91c0d2..e3cfaeab727d 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -57,14 +57,14 @@ 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/jar$(EXEEXT)
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 else
 ZIP = jar
 endif
 GCJH = gcjh
 else # CANADIAN
-GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
-ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
+GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
+ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 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 2de61223dc67..91edd98e2f5c 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -148,11 +148,11 @@ secdir = $(libdir)/security
 @NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
 
 bin_SCRIPTS = addr2name.awk
-@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
+@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 @CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
-@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
+@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
 @CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
-@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
+@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh
 
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8