* Makefile.in (install): Redirect ln output to /dev/null. If ln

	fails on gasp, install gasp.new, not gasp.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28fd55d30589bb22a0a2fbfb09eef882e49b027f..788a23b5dd4a0541088d17b64d564f18be74dabe 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 18 13:08:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+       * Makefile.in (install): Redirect ln output to /dev/null.  If ln
+       fails on gasp, install gasp.new, not gasp.
+
 Wed May 18 09:16:36 1994  Jeff Law  (law@snake.cs.utah.edu)
 
        * config/tc-hppa.c (pa_ip): Use R_HPPA_ABS_CALL, not R_HPPA for

diff --git a/gas/Makefile.in b/gas/Makefile.in
index 7473c7e038a98f8651fefad4bc1d99be06f73cd1..ae98eb52d5438702688c4fe3a986fbb00866aee8 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -50,7 +50,7 @@ infodir = $(prefix)/info
 includedir = $(prefix)/include
 docdir = $(datadir)/doc
 
-VERSION=cygnus-2.2.1
+VERSION=cygnus-2.2.90
 
 SHELL = /bin/sh
 
@@ -457,7 +457,7 @@ install:
        if [ -d $(tooldir) ]; then \
          if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
          rm -f $(tooldir)/bin/as; \
-         ln $(bindir)/$$n $(tooldir)/bin/as \
+         ln $(bindir)/$$n $(tooldir)/bin/as >/dev/null 2>/dev/null \
           || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as; \
        else true; fi
        srcroot=`cd $(srcroot); pwd`; export srcroot; \
@@ -466,8 +466,8 @@ install:
        if [ -d $(tooldir) ]; then \
          if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
          rm -f $(tooldir)/bin/gasp; \
-         ln $(bindir)/$$n $(tooldir)/bin/gasp \
-          || $(INSTALL_PROGRAM) gasp $(tooldir)/bin/gasp; \
+         ln $(bindir)/$$n $(tooldir)/bin/gasp >/dev/null 2>/dev/null \
+          || $(INSTALL_PROGRAM) gasp.new $(tooldir)/bin/gasp; \
        else true; fi
 
 # Cancel installation by deleting the installed files.
@@ -482,22 +482,22 @@ uninstall:
 
 tags TAGS: force
        etags $(REAL_HEADERS) $(REAL_SOURCES) $(srcdir)/config/*.[hc] $(srcdir)/README $(srcdir)/Makefile.in
-       
+
 bootstrap: as.new force
        $(MAKE) stage1
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) stage2
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 bootstrap2: force
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) stage2
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 bootstrap3: force
-       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new
+       $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as.new gasp.new
        $(MAKE) comparison against=stage2
 
 # Copy the object files from a particular stage into a subdirectory.