From 74557dc6bb88da37cefb0e7fdc6b54fbf5fffe93 Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Tue, 1 Feb 1994 03:23:19 +0000
Subject: [PATCH] Mon Jan 31 18:52:47 1994  Stan Shebs 
 (shebs@andros.cygnus.com)

	* mpw-build.in: Add install action.
	* mpw-make.in (cplusfilt): Renamed from c++filt.
	(INCLUDES): Add more paths.
---
 binutils/ChangeLog.mpw |  6 ++++++
 binutils/mpw-build.in  | 20 +++++++++++++++++++-
 binutils/mpw-make.in   |  6 +++---
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/binutils/ChangeLog.mpw b/binutils/ChangeLog.mpw
index de7e16eddc0..97ad1b2c5a9 100644
--- a/binutils/ChangeLog.mpw
+++ b/binutils/ChangeLog.mpw
@@ -1,3 +1,9 @@
+Mon Jan 31 18:52:47 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-build.in: Add install action.
+	* mpw-make.in (cplusfilt): Renamed from c++filt.
+	(INCLUDES): Add more paths.
+
 Sat Jan 22 16:25:09 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-build.in: New file, build script fragment for MPW make.
diff --git a/binutils/mpw-build.in b/binutils/mpw-build.in
index aa037e893c1..d8326fadd6d 100644
--- a/binutils/mpw-build.in
+++ b/binutils/mpw-build.in
@@ -29,6 +29,22 @@ End Loop
 
 Set libsubdir "{libdir}"gcc-lib:"{target_canonical}":"{version}":
 
+Set AR_PROG ar
+Set RANLIB_PROG ranlib
+# objcopy and strip should be the same program
+Set OBJCOPY_PROG objcopy
+Set STRIP_PROG strip
+Set STRINGS_PROG strings
+# These should all be the same program too.
+Set SIZE_PROG size
+Set NM_PROG nm
+Set OBJDUMP_PROG objdump
+# This is the demangler, as a standalone program.
+Set DEMANGLER_PROG cplusfilt
+Set NLMCONV_PROG nlmconv
+
+Set PROGS "{SIZE_PROG} {OBJDUMP_PROG} {NM_PROG} {AR_PROG} {STRINGS_PROG} {STRIP_PROG} {RANLIB_PROG} {DEMANGLER_PROG} {OBJCOPY_PROG}"
+
 If "{BuildTarget}" =~ /all/
 	Echo "Set Echo 1" >all.makeout
 	Make >>all.makeout
@@ -43,7 +59,9 @@ Else If "{BuildTarget}" =~ /install/
 		NewFolder "{bindir}"
 	End If
 	# Need to copy all the tools
-	Duplicate -y :objdump "{bindir}"objdump
+	For prog in {PROGS}
+		Duplicate -y :{prog} "{bindir}"{prog}
+	End For
 Else
 	Echo {BuildTarget} not a valid build target
 End If
diff --git a/binutils/mpw-make.in b/binutils/mpw-make.in
index 24bc9f0fcb2..5c0dca0b0d2 100644
--- a/binutils/mpw-make.in
+++ b/binutils/mpw-make.in
@@ -93,7 +93,7 @@ DIST_NAME=binutils-{VERSION}
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = "{srcdir}":texinfo
 
-MANPAGES= ar nm objdump ranlib size strings strip c++filt objcopy nlmconv
+MANPAGES= ar nm objdump ranlib size strings strip cplusfilt objcopy nlmconv
 
 #CC=gcc -Wall
 # these two are almost the same program
@@ -112,7 +112,7 @@ NM_PROG=nm
 OBJDUMP_PROG=objdump
 
 # This is the demangler, as a standalone program.
-DEMANGLER_PROG=c++filt
+DEMANGLER_PROG=cplusfilt
 
 NLMCONV_PROG=nlmconv
 
@@ -124,7 +124,7 @@ DISTSTUFF=arparse.c :arlex.c "{s}"nlmheader.c info
 BASEDIR = "{srcroot}"
 BFDDIR = {BASEDIR}bfd
 INCDIR	= {BASEDIR}include
-INCLUDES = -i "{srcroot}"extra-include -i : -i {srcdir} -i ::bfd: -i {BFDDIR} -i {INCDIR}
+INCLUDES = -i "{INCDIR}":mpw: -i ::extra-include: -i : -i {srcdir} -i ::bfd: -i {BFDDIR} -i {INCDIR}
 
 #### host and target dependant Makefile fragments come in here.
 ###
-- 
2.30.2