Redesign the structure for setup and clean rules. New structure uses

shell scripts in each directory, which the makefiles refer to.  This
greatly simplifies the configuration code because it was getting too
painful to put complex shell scripts inside the makefiles.

diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index df0a8b7a03f00ee6ba827cd93d211c1a91cf4913..49270eeb4bd433542a7d971bc1b1b83a53265655 100755 (executable)
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.1 2000/12/08 04:49:37 cph Exp $
+# $Id: Setup.sh,v 1.2 2000/12/08 06:19:43 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -31,7 +31,7 @@ maybe_mkdir ()
 
 maybe_link ()
 {
-    if [ ! -e ${1} ]; then
+    if [ ! -L ${1} ]; then
        echo "ln -s ${2} ${1}"
        ln -s ${2} ${1}
     fi

diff --git a/v7/src/compiler/Clean.sh b/v7/src/compiler/Clean.sh
index 80cf1b81838f25adc402ebcdd75e30f8fd131b84..4f57c5dd4c61f9a69154c223f11685e4a61e5ec2 100755 (executable)
--- a/v7/src/compiler/Clean.sh
+++ b/v7/src/compiler/Clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Clean.sh,v 1.2 2000/12/08 06:12:52 cph Exp $
+# $Id: Clean.sh,v 1.3 2000/12/08 06:15:12 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -30,7 +30,7 @@ fi
 
 for SUBDIR in back base fggen fgopt machine rtlbase rtlgen rtlopt; do
     if [ -d ${SUBDIR} ]; then
-       echo "making ${COMMAND} in ${SUBDIR}"
+       echo "making ${1} in ${SUBDIR}"
        (cd ${SUBDIR} && rm -f *.bin *.ext *.com *.bci)
     fi
 done

diff --git a/v7/src/etc/Setup.sh b/v7/src/etc/Setup.sh
index 638116568637c6e06e1a354ecbe203265892ec85..93c8cc5c95eb297b61846a2850e193494940abff 100755 (executable)
--- a/v7/src/etc/Setup.sh
+++ b/v7/src/etc/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.3 2000/12/08 06:04:32 cph Exp $
+# $Id: Setup.sh,v 1.4 2000/12/08 06:12:52 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -34,7 +34,7 @@ maybe_link ()
     fi
 }
 
-maybe_link Makefile ../etc/Makefile.std
+maybe_link Makefile ../Makefile.std
 for FN in Clean.sh Stage.sh Tags.sh; do
     maybe_link ${FN} ../etc/${FN}
 done

diff --git a/v7/src/runtime-check/Setup.sh b/v7/src/runtime-check/Setup.sh
index 1c8ce44c5a10c5c7a3856c8741c86fda58849d23..5925e77921719b436cfc34e224637aadc39b8909 100755 (executable)
--- a/v7/src/runtime-check/Setup.sh
+++ b/v7/src/runtime-check/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.1 2000/12/08 05:12:15 cph Exp $
+# $Id: Setup.sh,v 1.2 2000/12/08 06:13:56 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -30,7 +30,7 @@ fi
 
 maybe_link ()
 {
-    if [ ! -e ${1} ]; then
+    if [ ! -L ${1} ]; then
        echo "ln -s ${2} ${1}"
        ln -s ${2} ${1}
     fi