* Makefile.am (install-exec-local): Don't remove the file before

	checking whether $(bindir) == $(tooldir)/bin.  From Maciej
	W. Rozycki <macro@ds2.pg.gda.pl>.
	* Makefile.in: Rebuild.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 27afe7d0fe27744da1bb934bbbdd0d7526c9b575..b08110953500ed29b66ca48effe58ffc620a53b8 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 24 16:31:49 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+       * Makefile.am (install-exec-local): Don't remove the file before
+       checking whether $(bindir) == $(tooldir)/bin.  From Maciej
+       W. Rozycki <macro@ds2.pg.gda.pl>.
+       * Makefile.in: Rebuild.
+
 Fri Jul 24 09:13:46 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * cgen.c: Include libiberty.h.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index c4bf1d68fa05e2ff18912c50d8b3127341906f26..441064550dddac9afd93849b96559289a6203a63 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -558,9 +558,9 @@ install-exec-local: $(noinst_PROGRAMS)
            $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
-       rm -f $(tooldir)/bin/as$(EXEEXT)
        n=`echo as | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
+         rm -f $(tooldir)/bin/as$(EXEEXT); \
          ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
            || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT); \
        fi

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 485e3b9ed239d47277a83b8a4313c29ec20ba831..ddb6ae075dc38bfdf8cb4805e51a13752e0def30 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -1766,9 +1766,9 @@ install-exec-local: $(noinst_PROGRAMS)
            $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e 's/-new//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
-       rm -f $(tooldir)/bin/as$(EXEEXT)
        n=`echo as | sed '$(transform)'`; \
        if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/as$(EXEEXT)" ]; then \
+         rm -f $(tooldir)/bin/as$(EXEEXT); \
          ln $(bindir)/$$n$(EXEEXT) $(tooldir)/bin/as$(EXEEXT) >/dev/null 2>/dev/null \
            || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) as-new$(EXEEXT) $(tooldir)/bin/as$(EXEEXT); \
        fi