From: Stan Shebs <shebs@codesourcery.com>
Date: Sat, 26 Feb 1994 21:25:10 +0000 (+0000)
Subject: Sat Feb 26 13:23:06 1994  Stan Shebs  (shebs@andros.cygnus.com)
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=edd9075caff5c19967ee23c38b8deef4c65e7969;p=deliverable%2Fbinutils-gdb.git

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

	* mpw-make.in (install): Moved here from mpw-build.in.
	* mpw-build.in: Removed, functionality in mpw-make.in
---

diff --git a/gas/ChangeLog.mpw b/gas/ChangeLog.mpw
index 2505c38702..89e89d3705 100644
--- a/gas/ChangeLog.mpw
+++ b/gas/ChangeLog.mpw
@@ -1,3 +1,8 @@
+Sat Feb 26 13:23:06 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-make.in (install): Moved here from mpw-build.in.
+	* mpw-build.in: Removed, functionality in mpw-make.in
+
 Mon Jan 31 18:06:41 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-make.in (CFLAGS): Add more include paths.
diff --git a/gas/mpw-build.in b/gas/mpw-build.in
deleted file mode 100644
index f35c93d10c..0000000000
--- a/gas/mpw-build.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# Script fragment to build MPW GAS.
-
-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}":
-
-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
-	Duplicate -y :as.new "{bindir}"as
-Else
-	Echo {BuildTarget} not a valid build target
-End If
diff --git a/gas/mpw-make.in b/gas/mpw-make.in
index b22cddc835..3a5f4b6b25 100644
--- a/gas/mpw-make.in
+++ b/gas/mpw-make.in
@@ -18,6 +18,10 @@ CFLAGS = -w -mc68020 -mc68881 -model far {CROSS} -d MPW -d TARGET_BYTES_BIG_ENDI
 .c.o  \Option-f .c
    {C}  {DepDir}{Default}.c {CFLAGS} {SymOptions} -s gas-{Default} -o {TargDir}{Default}.c.o
 
+prefix = usr:local:
+
+bindir = {prefix}bin:
+
 OBJECTS = \Option-d
 		"{o}"app.c.o \Option-d
 		"{o}"as.c.o \Option-d
@@ -93,3 +97,13 @@ as.new \Option-f\Option-f {OBJECTS} "{o}"obj-format.c.o "{o}"targ-cpu.c.o "{o}"a
 "{o}"write.c.o \Option-f "{s}"write.c {INCLUDES}
 "{o}"ecoff.c.o \Option-f "{s}"ecoff.c {INCLUDES}
 "{o}"xmalloc.c.o \Option-f "{s}"xmalloc.c {INCLUDES}
+
+install \Option-f
+	If "`Exists "{prefix}"`" == ""
+		Echo "{prefix}" does not exist, cannot install anything
+		Exit 1
+	End If
+	If "`Exists "{bindir}"`" == ""
+		NewFolder "{bindir}"
+	End If
+	Duplicate -y :as.new "{bindir}"as