From c613f4c2b9ee624cb3cec964498472a6081c09f8 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 6 Dec 2000 05:12:33 +0000
Subject: [PATCH] Move compiler configuration to a file in the compiler
 directory.

---
 v7/src/compiler/configure |  6 +++---
 v7/src/configure          | 40 +++++----------------------------------
 2 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/v7/src/compiler/configure b/v7/src/compiler/configure
index 3265eae4b..915abe86e 100755
--- a/v7/src/compiler/configure
+++ b/v7/src/compiler/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: configure,v 1.1 2000/12/06 05:11:59 cph Exp $
+# $Id: configure,v 1.2 2000/12/06 05:12:33 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -46,8 +46,8 @@ if test ! -f machine; then
 	exit 1
 	;;
     esac
-    ln -s machines/${MACHINE} compiler/machine
+    ln -s machines/${MACHINE} machine
 fi
 for FN in compiler.cbf compiler.pkg compiler.sf make.com; do \
-    test -f compiler/$${FN} || ln -s machine/$${FN} compiler/.; \
+    test -f $${FN} || ln -s machine/$${FN} .; \
 done
diff --git a/v7/src/configure b/v7/src/configure
index 87e2b2aae..646ab4d2e 100755
--- a/v7/src/configure
+++ b/v7/src/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: configure,v 1.1 2000/12/06 04:46:33 cph Exp $
+# $Id: configure,v 1.2 2000/12/06 05:12:05 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -18,38 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# The microcode has its own configuration script.
-(cd microcode && ./configure)
+SUBDIRS=microcode compiler
 
-# The compiler only needs to know if the machine is an architecture we
-# target.  Run config.guess and parse the output.
-if [ ! -f compiler/machine ]; then
-    case `microcode/config.guess` in
-    alpha-* | alphaev[56]-* | alphaev56-* | alphapca56-* )
-	MACHINE=alpha
-	;;
-    m68k-* )
-	MACHINE=bobcat
-	;;
-    i[3456]86-* )
-	MACHINE=i386
-	;;
-    mips-* | mipsel-* )
-	MACHINE=mips
-	;;
-    sparc-* )
-	MACHINE=sparc
-	;;
-    hppa-* | hppa1.[01]-* | hppa2.?-* )
-	MACHINE=spectrum
-	;;
-    vax-* )
-	MACHINE=vax
-	;;
-    * )
-	echo "Unable to determine machine type."
-	exit 1
-	;;
-    esac
-    ln -s machines/${MACHINE} compiler/machine
-fi
+for SUBDIR in ${SUBDIRS}; do
+    (cd ${SUBDIR} && ./configure)
+done
-- 
2.25.1