From 7e10f53ccf9100e8191e7cc18af0c165f7973ea6 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 1 Sep 1992 01:14:04 +0000
Subject: [PATCH] Brought forward from p3:

Sun Aug 30 21:24:46 1992  Ian Lance Taylor  (ian@cygnus.com)

	* Makefile.in: map "as" through program_transform_name when
	installing.
---
 gas/ChangeLog     |  5 +++++
 gas/Makefile.in   | 22 ++++++++++------------
 gas/doc/ChangeLog |  5 +++++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index bac3bd0a9eb..e9846340f8e 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 30 21:24:46 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in: map "as" through program_transform_name when
+	installing.
+
 Sat Aug 29 12:11:12 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
 
 	* Makefile.in (as.new): Depend on LOCAL_LOADLIBES.
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 3f3ffcf9c70..479e1706583 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -28,8 +28,7 @@ srcdir = .
 
 prefix = /usr/local
 
-program_prefix =
-program_suffix =
+program_transform_name =
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
@@ -356,19 +355,18 @@ install:
 	-parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \
 	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
 	-if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi
-	-rm -f $(bindir)/$(program_prefix)as$(program_suffix)
-	$(INSTALL_PROGRAM) as.new $(bindir)/$(program_prefix)as$(program_suffix)
-	-rm -f  $(tooldir)/as
-	ln $(bindir)/$(program_prefix)as$(program_suffix) $(tooldir)/as
-	-rm -f $(man1dir)/$(program_prefix)as$(program_suffix).1
-	$(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$(program_prefix)as$(program_suffix).1
+	-n=`t='$(program_transform_name)'; echo as | sed -e "" $$t`; \
+	rm -f $(bindir)/$$n; \
+	$(INSTALL_PROGRAM) as.new $(bindir)/$$n; \
+	rm -f $(tooldir)/as; \
+	ln $(bindir)/$$n $(tooldir)/as || cp $(bindir)/$$n $(tooldir)/as; \
+	$(INSTALL_DATA) $(srcdir)/doc/as.1 $(man1dir)/$$n.1
 
 # Cancel installation by deleting the installed files.
 uninstall:
-	-rm -rf $(libsubdir)
-	-rm -rf $(bindir)/as
-	-rm -rf $(mandir)/gas.$(manext)
-
+	-n=`t='$(program_transform_name)'; echo as | sed -e "" $$t`; \
+	rm -f $(bindir)/$$n; \
+	rm -f $(mandir)/$$n.1
 
 # These exist for maintenance purposes.
 
diff --git a/gas/doc/ChangeLog b/gas/doc/ChangeLog
index 5096fc35881..3826d8b48c8 100644
--- a/gas/doc/ChangeLog
+++ b/gas/doc/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 30 21:26:05 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+ 	* Makefile.in: map "as" through program_transform_name when
+	installing.
+
 Tue Aug 18 14:19:01 1992  Ian Lance Taylor  (ian@cygnus.com)
 
 	* Makefile.in: always create installation directories.
-- 
2.30.2