From 5640944588014155afff369a7da8c0cd9882ad9b Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 15 Sep 1992 23:30:30 +0000
Subject: [PATCH] Tue Sep 15 15:35:38 1992  Ian Lance Taylor  (ian@cygnus.com)

	* Makefile.in (install): if $(tooldir) exists, install ld in
	$(tooldir)/bin.
---
 ld/ChangeLog   |  5 +++++
 ld/Makefile.in | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7ce4a44..ed5ad59 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 15 15:35:38 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+	* Makefile.in (install): if $(tooldir) exists, install ld in
+	$(tooldir)/bin.
+
 Fri Sep 11 10:24:22 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 
 	* Makefile.in, configure.in: modified to support i386-coff
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 498d2cc..194c901 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -26,7 +26,7 @@ program_transform_name =
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
-tooldir = $(bindir)
+tooldir = $(bindir)/$(target_alias)
 datadir = $(prefix)/lib
 mandir = $(prefix)/man
 man1dir = $(mandir)/man1
@@ -460,8 +460,13 @@ install: $(LD_PROG)
 	-n=`t='$(program_transform_name)'; echo ld | sed -e "" $$t`; \
 	rm -f $(bindir)/$$n; \
 	$(INSTALL_PROGRAM) ld.new $(bindir)/$$n; \
-	$(INSTALL_DATA) $(srcdir)/ld.1 $(man1dir)/$$n.1
-	-if [ -d $(tooldir) ]; then rm -f $(tooldir)/ld; $(INSTALL_PROGRAM) ld.new $(tooldir)/ld; else true; fi
+	$(INSTALL_DATA) $(srcdir)/ld.1 $(man1dir)/$$n.1; \
+	if [ -d $(tooldir) ]; then \
+	  if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
+	  rm -f $(tooldir)/bin/ld; \
+	  ln $(bindir)/$$n $(tooldir)/bin/ld \
+	   || $(INSTALL_PROGRAM) ld.new $(tooldir)/bin/ld; \
+	else true; fi
 
 install-info: info
 	-parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \
-- 
2.7.4