From 8b898eb168feb87a7f7a190b5c35587293554f20 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 24 Jul 1998 20:33:13 +0000 Subject: [PATCH] * Makefile.am (install-exec-local): Don't remove the file before checking whether $(bindir) == $(tooldir)/bin. From Maciej W. Rozycki . * Makefile.in: Rebuild. --- gas/ChangeLog | 7 +++++++ gas/Makefile.am | 2 +- gas/Makefile.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 27afe7d..b081109 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 24 16:31:49 1998 Ian Lance Taylor + + * Makefile.am (install-exec-local): Don't remove the file before + checking whether $(bindir) == $(tooldir)/bin. From Maciej + W. Rozycki . + * Makefile.in: Rebuild. + Fri Jul 24 09:13:46 1998 Doug Evans * cgen.c: Include libiberty.h. diff --git a/gas/Makefile.am b/gas/Makefile.am index c4bf1d6..4410645 100644 --- 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 485e3b9..ddb6ae0 100644 --- 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 -- 2.7.4