From 138b11d825753bef6aaae5ebe1e9c02c94ab1924 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Fri, 8 Sep 1995 18:43:50 +0000
Subject: [PATCH] 	* Makefile.in (install): Don't install gasp in
 $(tooldir).

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

diff --git a/gas/ChangeLog b/gas/ChangeLog
index c0146f7..f725a04 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,7 @@
 Fri Sep  8 00:27:46 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+	* Makefile.in (install): Don't install gasp in $(tooldir).
+
 	* config/tc-mips.c (macro): Handle a non zero base register for
 	M_U{L,S}{D,W,H}_A.
 
diff --git a/gas/Makefile.in b/gas/Makefile.in
index c997b59..88dbabf 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -255,8 +255,8 @@ $(OBJS): config.h as.h targ-env.h obj-format.h targ-cpu.h flonum.h expr.h \
 	struc-symbol.h write.h frags.h hash.h read.h symbols.h tc.h obj.h \
 	listing.h bignum.h
 
-gasp.new: $(GASPOBJS)
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gasp.new $(GASPOBJS) $(LIBS) $(LOADLIBES)
+gasp.new: $(GASPOBJS) ../libiberty/libiberty.a
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gasp.new $(GASPOBJS) ../libiberty/libiberty.a $(LOADLIBES)
 
 installcheck:
 	@echo No installcheck target is available yet for the GNU assembler.
@@ -413,14 +413,7 @@ install:
 	   || $(INSTALL_PROGRAM) as.new $(tooldir)/bin/as; \
 	else true; fi
 	srcroot=`cd $(srcroot); pwd`; export srcroot; \
-	$(INSTALL_XFORM) gasp.new $(bindir)/gasp; \
-	n=`echo gasp | sed '$(program_transform_name)' `; \
-	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 >/dev/null 2>/dev/null \
-	   || $(INSTALL_PROGRAM) gasp.new $(tooldir)/bin/gasp; \
-	else true; fi
+	$(INSTALL_XFORM) gasp.new $(bindir)/gasp
 
 # Cancel installation by deleting the installed files.
 uninstall:
-- 
2.7.4