Mon Feb 28 11:07:41 1994 Stan Shebs (shebs@andros.cygnus.com)

	* mpw-build.in: Remove, subsumed in mpw-make.in.
	* mpw-make.in (bindir): Fix pathname.
	(install): Move here from mpw-build.in.

3 files changed, 18 insertions, 59 deletions

diff --git a/ld/ChangeLog.mpw b/ld/ChangeLog.mpw
index b2e64f3..52ba9aa 100644
--- a/ld/ChangeLog.mpw
+++ b/ld/ChangeLog.mpw
@@ -1,3 +1,9 @@
+Mon Feb 28 11:07:41 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* mpw-build.in: Remove, subsumed in mpw-make.in.
+	* mpw-make.in (bindir): Fix pathname.
+	(install): Move here from mpw-build.in.
+
 Tue Jan 25 19:54:19 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* mpw-config.in: New file, MPW configuration fragment.
diff --git a/ld/mpw-build.in b/ld/mpw-build.in
deleted file mode 100644
index 45a5f32..0000000
--- a/ld/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 :ld.new "{bindir}"ld
-Else
-	Echo {BuildTarget} not a valid build target
-End If
diff --git a/ld/mpw-make.in b/ld/mpw-make.in
index f4fb1d6..95fe1b6 100644
--- a/ld/mpw-make.in
+++ b/ld/mpw-make.in
@@ -39,7 +39,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}
 datadir = {prefix}:lib
@@ -225,12 +225,14 @@ info \Option-f  ld.info
 	{CC} {INCLUDES} {HDEFINES} {TDEFINES} {CDEFINES} -d DEFAULT_EMULATION=\Option-d"{EMUL}\Option-d" -d SCRIPTDIR=\Option-d"{scriptdir}\Option-d" {CFLAGS} "{s}"ldmain.c -o "{o}"ldmain.c.o
 	fi
 
-
+# Use this when flex is working correctly.
 :ldlex.c \Option-f  "{s}"ldlex.l
 	{LEX} -i  -Cem "{srcdir}"ldlex.l
 	Catenate :lex.yy.c >:ldlex.c.new
 	Delete -y :lex.yy.c
 	Rename -y :ldlex.c.new :ldlex.c
+#:ldlex.c \Option-f  "{s}"mpw-ldlex.c
+#	Catenate "{s}"mpw-ldlex.c >:ldlex.c
 
 # These all start with em_ so 'make clean' can find them.
 
@@ -622,15 +624,14 @@ TAGS \Option-f
 
 
 install \Option-f  
-	{INSTALL_XFORM} ld.new {bindir}:ld
-	{INSTALL_XFORM1} "{srcdir}"ld.1 {man1dir}:ld.1
-	for f in ldscripts:\Option-x; do \Option-d
-	  {INSTALL_DATA} $$f {scriptdir}:$$f ; \Option-d
-	done
-	n=`t='{program_transform_name}'; echo ld | sed -e "" $$t`; \Option-d
-	  Delete -y {tooldir}:bin:ld; \Option-d
-	  # ln {bindir}:$$n {tooldir}:bin:ld \Option-d
-	   || {INSTALL_PROGRAM} ld.new {tooldir}:bin:ld
+	If "`Exists "{prefix}"`" == ""
+		Echo "{prefix}" does not exist, cannot install anything
+		Exit 1
+	End If
+	If "`Exists "{bindir}"`" == ""
+		NewFolder "{bindir}"
+	End If
+	Duplicate -y :ld.new "{bindir}"ld
 
 install-info \Option-f  
 	for i in ld.info\Option-x ; do \Option-d