From 4dfe09da09673f76512afbbecf8b2abb7ae195c6 Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Thu, 22 Aug 1991 07:15:49 +0000
Subject: [PATCH] Three part names, etc.

---
 Makefile.in      | 44 +++++++++++++++++++++----
 bfd/configure.in | 84 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 04662c7c8e9..f1b654d86b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,23 @@
 #
 # Makefile for directory with subdirs to build.
+#   Copyright (C) 1990, 1991 Cygnus Support
 #
-# Last Mod Wed Jul 24 18:25:48 PDT 1991, by rich@cygint.cygnus.com
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+#
+# Last Mod Tue Aug 20 12:48:54 PDT 1991, by rich@cygint.cygnus.com
 #
-
 # $Id$
 
 srcdir = .
@@ -15,9 +29,9 @@ destdir = /usr/local
 RANLIB = ranlib
 AR = ar
 AR_FLAGS = cqv
-BISONPATH = $(srcdir)/../bison`if [ -d $(srcdir)/bison.$(target) ] ; then echo .$(target) ; fi`
+BISONPATH = 
 
-BISON = $(BISONPATH)$(subdir)/bison -L $(BISONPATH)/
+BISON = `if [ -d $(srcdir)/../bison\`if [ -d $(srcdir)/bison.$(target) ] ; then echo .$(target) ; fi\`$(subdir) ] ; then echo $(srcdir)/../bison\`if [ -d $(srcdir)/bison.$(target) ] ; then echo .$(target) ; fi\`$(subdir)/bison -L $(srcdir)/../bison\`if [ -d $(srcdir)/bison.$(target) ] ; then echo .$(target) ; fi\`/; else echo yacc ; fi`
 
 SUBDIRS = libiberty readline bfd gdb binutils ld gas gcc gnulib
 OTHERS = 
@@ -78,6 +92,8 @@ pass:
 		"LOADLIBES=$(srcdir)/../gnulib`if [ -d $(srcdir)/binutils.$(target) ] ; \
 		then echo .$(target) ; fi`$(subdir)/$(stagepass)/gnulib.a /lib/libc.a" \
 		"LDFLAGS=-nostdlib /lib/crt0.o \
+		-L$(srcdir)/../gnulib`if [ -d $(srcdir)/gnulib.$(target) ] ; \
+		then echo .$(target) ; fi`$(subdir)/$(stagepass)/ \
 		-B$(srcdir)/../ld`if [ -d $(srcdir)/ld.$(target) ] ; \
 		then echo .$(target) ; fi`$(subdir)/$(stagepass)/"
 
@@ -148,7 +164,7 @@ force:
 Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
 	(cd $(srcdir) ; \
 		./configure +destdir=$(destdir) +norecurse \
-		 `if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
+		 `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \
 		$(host) +target=$(target))
 
 #
@@ -163,6 +179,7 @@ bfd.ilrt.tar.Z: force_update
 	make clean
 	./configure -rm sun4
 	rm -f bfd.ilrt.tar.Z
+	chmod og=u `find $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) -print`
 	tar cf - $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) \
 		| compress -v >bfd.ilrt.tar.Z
 
@@ -170,7 +187,22 @@ force_update:
 
 #
 # $Log$
-# Revision 1.20  1991/07/31 02:47:14  gnu
+# Revision 1.25  1991/08/22 07:15:49  rich
+# Three part names, etc.
+#
+# Revision 1.24  1991/08/20  01:57:31  rich
+# Another try at passing gnulib's location.
+#
+# Revision 1.23  1991/08/16  21:47:41  rich
+# Pass on BISON as bison only if bison is here.
+#
+# Revision 1.22  1991/08/07  19:15:26  rich
+# +forcesubdirs -> +subdirs
+#
+# Revision 1.21  1991/07/31  18:07:59  gnu
+# Set file permissions the same for everyone before making tar file.
+#
+# Revision 1.20  1991/07/31  02:47:14  gnu
 # Add bfd.ilrt.tar.Z "make" rules.
 #
 # Revision 1.19  1991/07/27  07:46:34  rich
diff --git a/bfd/configure.in b/bfd/configure.in
index 43f5acd2b74..ac1e98f2c2b 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -5,21 +5,95 @@
 
 srctrigger=libbfd.c
 srcname="bfd"
-commontargets=true
 
 # per-host:
 
-if [ ! -f config/hmake-${host} ] ; then
-	echo No such host available: ${host}
+if [ "${host_os}" = "posix" ] ; then
+	bfd_host=posix
+else
+	case "${host_cpu}" in
+	rs6000)	bfd_host=aix ;;
+	mips)
+		case "${host_vendor}" in
+		dec)	bfd_host=dec3100 ;;
+		esac
+		;;
+	m88k)
+		case "${host_vendor}" in
+		*)
+			case "${host_os}" in
+			dgux)	bfd_host=dgux ;;
+			esac
+			;;
+		esac
+		;;
+
+	m68k)
+		case "${host_vendor}" in
+		hp)	bfd_host=hp9000 ;;
+		sony)	bfd_host=news ;;
+		sun)	bfd_host=sun3 ;;
+		esac
+		;;
+
+	i386)
+		case "${host_vendor}" in
+		*)
+			case "${host_os}" in
+			sysv)	bfd_host=i386v ;;
+			esac
+			;;
+		esac
+		;;
+
+	sparc)
+		case "${host_vendor}" in
+		sun)	bfd_host=sun4 ;;
+		esac
+		;;
+
+	rtpc)	bfd_host=rtbsd ;;
+	tahoe | vax)	bfd_host=${host_cpu} ;;
+	esac
+fi
+
+if [ ! -f config/hmake-${bfd_host} ] ; then
+	echo '***' BFD does not support host ${host}
 	exit 1
 fi
 
+host_makefile_frag=config/hmake-${bfd_host}
+
 # per-target:
 
-if [ ! -f config/tmake-${target} ] ; then
-	echo No such target available: ${target}
+case ${target_os} in
+aout | coff | bout) bfd_target=${target_cpu}-${target_os} ;;
+sunos*)
+	case "${target_cpu}" in
+	m68k)	bfd_target=sun3 ;;
+	sparc)	bfd_target=sun4 ;;
+	esac
+	;;
+newsos)	bfd_target=news ;;
+*)
+	case "${target_cpu}" in
+	tahoe | vax)
+		bfd_target=${target_cpu} ;;
+	mips)
+		case "${host_vendor}" in
+		dec)	bfd_host=dec3100 ;;
+		esac
+		;;
+	esac
+	;;
+esac
+
+if [ ! -f config/tmake-${bfd_target} ] ; then
+	echo '***' BFD does not support target ${target}
 	exit 1
 fi
 
+target_makefile_fragment=config/tmake-${bfd_target}
+
 files=
 links=
-- 
2.30.2