From ac7f7dfeb9d437105e5813a19eb8a8f5570d4461 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 18 May 1994 17:11:19 +0000
Subject: [PATCH] 	* Makefile.in (install): Redirect ln output to
 /dev/null.  If ln 	fails on gasp, install gasp.new, not gasp.

---
 gas/ChangeLog   |  5 +++++
 gas/Makefile.in | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 28fd55d3058..788a23b5dd4 100644
--- 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 7473c7e038a..ae98eb52d54 100644
--- 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.
-- 
2.30.2