diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-17 17:04:08 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-17 17:04:08 +0000 |
| commit | 735cd89dcd1a1a98b21842de56ad6550d5b19061 (patch) | |
| tree | be86f644f900f93cdd955b846144877666206218 | |
| parent | f9636a669db9c65d4f2c187b6f5ab45e13018710 (diff) | |
* Makefile.am (ZIP): The "fastjar" binary is now plain "jar".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42207 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/Makefile.am | 6 | ||||
| -rw-r--r-- | libjava/Makefile.in | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4bb315f44be..d960f1b65ad 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 3760b32c102..f659f97b844 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 2002567e72f..5e5635b642c 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 = \ |