From 109eb06cce362f040b062107897826fc1b01431e Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 4 Sep 1995 21:14:33 +0000
Subject: [PATCH] 	* configure.in (host_makefile_frag): Don't set. 
 Substitute for 	@CC@, @CFLAGS@, @HDEFINES@ and @LDFLAGS@ in Makefile. 
 * Makefile.in (AR_FLAGS): Set to rc rather than qv. 	(CC): Define as @CC@. 
 (CFLAGS): Set to @CFLAGS@. 	(LDFLAGS): Define as @LDFLAGS@. 
 (ALL_CFLAGS): Use @HDEFINES@ rather than $(HDEFINES).

---
 binutils/ChangeLog    |  8 ++++++++
 binutils/Makefile.in  |  8 +++++---
 binutils/configure.in | 14 ++++++++------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 0f8695d18f2..ebb9ff65d64 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,13 @@
 Mon Sep  4 14:30:00 1995  Ian Lance Taylor  <ian@cygnus.com>
 
+	* configure.in (host_makefile_frag): Don't set.  Substitute for
+	@CC@, @CFLAGS@, @HDEFINES@ and @LDFLAGS@ in Makefile.
+	* Makefile.in (AR_FLAGS): Set to rc rather than qv.
+	(CC): Define as @CC@.
+	(CFLAGS): Set to @CFLAGS@.
+	(LDFLAGS): Define as @LDFLAGS@.
+	(ALL_CFLAGS): Use @HDEFINES@ rather than $(HDEFINES).
+
 	* configure.in: Don't bother to call config.bfd for each target.
 	Just call it for the default target, and use the shell variable to
 	decide whether underscores are used.
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 0588671df0a..961d7833c46 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -51,8 +51,10 @@ INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
 INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1
 
 AR = ar
-AR_FLAGS = qv
-CFLAGS = -g
+AR_FLAGS = rc
+CC = @CC@
+CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 RANLIB = ranlib
@@ -127,7 +129,7 @@ INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR)
 #### host and target dependant Makefile fragments come in here.
 ###
 
-ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS)
+ALL_CFLAGS = $(INCLUDES) @HDEFINES@ $(TDEFINES) $(CFLAGS)
 
 .c.o:
 	$(CC) -c $(ALL_CFLAGS) $<
diff --git a/binutils/configure.in b/binutils/configure.in
index 9177beb640c..878aa289673 100644
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -10,11 +10,6 @@ srcname="Binutils"
 
 . ${srcdir}/../bfd/configure.host
 
-host_makefile_frag=
-if [ -f ${srcdir}/../bfd/config/${my_host}.mh ] ; then
-	host_makefile_frag=../bfd/config/${my_host}.mh
-fi
-
 # per-target:
 
 # Canonicalize the secondary target names.
@@ -115,6 +110,13 @@ else
 fi
 echo "UNDERSCORE = ${underscore}" >> Makefile.2
 
-cat Makefile.tmp >> Makefile.2
+test -z "$CC" && CC=`egrep '^CC *=' ../Makefile | tail -1 | sed 's/^CC *= *//'`
+test -z "$CC" && CC=cc
+test -z "$CFLAGS" && CFLAGS=-g
+sed -e "s%@CC@%${CC}%" \
+    -e "s%@CFLAGS@%${CFLAGS}%" \
+    -e "s%@HDEFINES@%${HDEFINES}%" \
+    -e "s%@LDFLAGS@%${LDFLAGS}%" < Makefile.tmp >> Makefile.2
+
 rm -f Makefile.tmp
 mv Makefile.2 Makefile
-- 
2.30.2