Sat Feb 26 13:31:44 1994 Stan Shebs (shebs@andros.cygnus.com)

	* mpw-make (install): Replace with MPW-specific actions.
	* mpw-build.in: Remove, functionality subsumed in mpw-make.in.

3 files changed, 17 insertions, 82 deletions

diff --git a/binutils/ChangeLog.mpw b/binutils/ChangeLog.mpw
index 97ad1b2..e7f5238 100644
--- a/binutils/ChangeLog.mpw
+++ b/binutils/ChangeLog.mpw
@@ -1,3 +1,8 @@
+Sat Feb 26 13:31:44 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-make (install): Replace with MPW-specific actions.
+	* mpw-build.in: Remove, functionality subsumed in mpw-make.in.
+
 Mon Jan 31 18:52:47 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-build.in: Add install action.
diff --git a/binutils/mpw-build.in b/binutils/mpw-build.in
deleted file mode 100644
index d8326fa..0000000
--- a/binutils/mpw-build.in
+++ /dev/null
@@ -1,67 +0,0 @@
-# Script fragment to build MPW binutils.
-
-Set BuildTarget "none"
-
-Loop
-	Break If {#} == 0
-	If "{1}" =~ /--srcdir/
-		Set srcdir "{2}"
-		Shift 1
-	Else If "{1}" =~ /--topdir/
-		Set topsrcdir "{2}"
-		Shift 1
-	Else If "{1}" =~ /--prefix/
-		Set prefix "{2}"
-		Shift 1
-	Else If "{1}" =~ /-v/
-		Set verify 1
-		Set verifystr "-v"
-		Shift 1
-	Else
-		If "{BuildTarget}" =~ /none/
-			Set BuildTarget "{1}"
-		Else
-			Echo Only one build target allowed, ignoring "{1}"
-		End If
-	End If
-	Shift 1
-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
-	all.makeout
-	Delete all.makeout
-Else If "{BuildTarget}" =~ /install/
-	If "`Exists "{prefix}"`" == ""
-		Echo "{prefix}" does not exist, cannot install anything
-		Exit 1
-	End If
-	If "`Exists "{bindir}"`" == ""
-		NewFolder "{bindir}"
-	End If
-	# Need to copy all the tools
-	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 5c0dca0..8e53997 100644
--- a/binutils/mpw-make.in
+++ b/binutils/mpw-make.in
@@ -37,7 +37,7 @@ prefix = :usr:local
 
 program_transform_name =
 exec_prefix = {prefix}
-bindir = {exec_prefix}:bin
+bindir = {exec_prefix}bin:
 libdir = {exec_prefix}:lib
 tooldir = {exec_prefix}:{target_alias}
 
@@ -459,20 +459,17 @@ TAGS \Option-f  force
 	etags {INCDIR}:\Option-x.h "{srcdir}"\Option-x.[hc] 
 
 install \Option-f  all
-	for i in {PROGS} ; do \Option-d
-	  {INSTALL_XFORM} $$i {bindir}:$$i ; \Option-d
-	done
-	for i in {MANPAGES} ; do \Option-d
-	  {INSTALL_XFORM1} "{srcdir}"$$i.1 {man1dir}:$$i.1 ; \Option-d
-	done
-	if [ -d {tooldir} ]; then \Option-d
-	   if [ -d {tooldir}:bin ] ; then true ; else mkdir {tooldir}:bin ; fi; \Option-d
-	   for i in nm strip ar ranlib; do \Option-d
-	     Delete -y {tooldir}:bin:$$i; \Option-d
-	     # ln {bindir}:`t='{program_transform_name}'; echo $$i | sed -e "" $$t` {tooldir}:bin:$$i \Option-d
-	      || {INSTALL_PROGRAM} $$i {tooldir}:bin:$$i; \Option-d
-	   done; \Option-d
-	 else true; fi		
+	If "`Exists "{prefix}"`" == ""
+		Echo "{prefix}" does not exist, cannot install anything
+		Exit 1
+	End If
+	If "`Exists "{bindir}"`" == ""
+		NewFolder "{bindir}"
+	End If
+	# Need to copy all the tools
+	For prog in {PROGS}
+		Duplicate -y :{prog} "{bindir}"{prog}
+	End For
 
 # Use binutils.info as the target so that VPATH will DTRT.
 # (Use "$<\Option-x" in case the output is multiple files, though.)