From dda8716b94b8e1302df82d5ca0c240df8b992e91 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Tue, 16 Jan 1996 20:12:17 +0000
Subject: [PATCH] 	* mpw-config.in (BUILD_NLMCONV, BUILD_SRCONV,
 SYSINFO_PROG, 	BUILD_DLLTOOL): Put definitions for these into makefile when 
 configuring, instead of always clearing in mpw-make.sed. 	*
 mpw-make.sed: Edit out any host_alias or target_alias settings, 	fix
 pathname to BFD internal include files, remove dependency 	calculation
 rules.

---
 binutils/ChangeLog     |  9 +++++++++
 binutils/mpw-config.in |  4 ++++
 binutils/mpw-make.sed  | 20 ++++++++++++++------
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index a0a2cf5605..c472f64e9c 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan 16 12:07:25 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-config.in (BUILD_NLMCONV, BUILD_SRCONV, SYSINFO_PROG,
+	BUILD_DLLTOOL): Put definitions for these into makefile when
+	configuring, instead of always clearing in mpw-make.sed.
+	* mpw-make.sed: Edit out any host_alias or target_alias settings,
+	fix pathname to BFD internal include files, remove dependency
+	calculation rules.
+
 Thu Jan 11 17:31:38 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
 	* objdump.c (dump_section_header): Add new section flags
diff --git a/binutils/mpw-config.in b/binutils/mpw-config.in
index 90ea628fb2..21a067ddd6 100644
--- a/binutils/mpw-config.in
+++ b/binutils/mpw-config.in
@@ -15,6 +15,10 @@ End If
 Echo '# From mpw-config.in'				 > "{o}"mk.tmp
 Echo "ARCHDEFS = -d" {archname}				>> "{o}"mk.tmp
 Echo "UNDERSCORE = " {underscore}			>> "{o}"mk.tmp
+Echo "BUILD_NLMCONV = "					>> "{o}"mk.tmp
+Echo "BUILD_SRCONV = "					>> "{o}"mk.tmp
+Echo "SYSINFO_PROG = "					>> "{o}"mk.tmp
+Echo "BUILD_DLLTOOL = "					>> "{o}"mk.tmp
 Echo '# End from mpw-config.in'				>> "{o}"mk.tmp
 
 Echo '/* config.h.  Generated by mpw-configure.  */'	 > "{o}"config.new
diff --git a/binutils/mpw-make.sed b/binutils/mpw-make.sed
index 1fba3c7e48..1285856221 100644
--- a/binutils/mpw-make.sed
+++ b/binutils/mpw-make.sed
@@ -1,15 +1,14 @@
 # Sed commands to finish translating the binutils Unix makefile into MPW syntax.
 
-# Define undefined makefile variables.
+# Add a rule.
 /^#### .*/a\
 \
-BUILD_NLMCONV = \
-BUILD_SRCONV = \
-SYSINFO_PROG = \
-BUILD_DLLTOOL = \
-\
 "{o}"underscore.c.o \\Option-f "{o}"underscore.c\
 
+# Comment out any alias settings.
+/^host_alias =/s/^/#/
+/^target_alias =/s/^/#/
+
 # Whack out unused host define bits.
 /HDEFINES/s/@HDEFINES@//
 
@@ -37,6 +36,10 @@ BUILD_DLLTOOL = \
 /^{[A-Z]*_PROG}/s/$/ "{s}"mac-binutils.r/
 /{[A-Z]*_PROG}\.r/s/{[A-Z]*_PROG}\.r/mac-binutils.r/
 
+# There are auto-generated references to BFD .h files that are not
+# in the objdir (like bfd.h) but are in the source dir.
+/::bfd:lib/s/::bfd:lib\([a-z]*\)\.h/{BFDDIR}:lib\1.h/g
+
 # Fix the locations of generated files.
 /config/s/"{s}"config\.h/"{o}"config.h/g
 /config/s/^config\.h/"{o}"config\.h/
@@ -84,6 +87,11 @@ install-only \\Option-f\
 	End For\
 
 
+/true/s/ ; @true$//
+
+# dot files are trouble, remove them and their actions.
+/^\.dep/,/^$/d
+
 # Remove un-useful targets.
 /^Makefile \\Option-f/,/^$/d
 /^"{o}"config.h \\Option-f/,/^$/d
-- 
2.34.1