Use autoconf for top-level Makefile.

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 95c27bd9fa40866085a0835108bf9256647a77fc..737eddff5298cb3922fb34a31b1b53bee14af9d2 100644 (file)
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.1 2000/12/08 17:47:19 cph Exp $
+# $Id: Makefile.in,v 1.2 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -73,9 +73,6 @@ all:
        scheme -compiler -heap 4000 < etc/compile.scm
        etc/build-bands.sh
 
-setup:
-       ./Setup.sh $(SUBDIRS)
-
 mostlyclean clean distclean maintainer-clean:
        ./Clean.sh $@ $(SUBDIRS)
 
@@ -134,5 +131,4 @@ install: all
            $(INSTALL_DATA) imail/$${FN} $(DESTDIR)$(AUXDIR)/imail/.;\
        done
 
-.PHONY: all setup mostlyclean clean distclean maintainer-clean
-.PHONY: tags TAGS install
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS install

diff --git a/v7/src/Makefile.std b/v7/src/Makefile.std
index a6ae3ccfce939b741df3fc7559ccac201e9be324..5e45176cdef3e1e5945f758aeb0ac66a40be16fc 100644 (file)
--- a/v7/src/Makefile.std
+++ b/v7/src/Makefile.std
@@ -1,4 +1,4 @@
-# $Id: Makefile.std,v 1.10 2000/12/08 06:04:32 cph Exp $
+# $Id: Makefile.std,v 1.11 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -26,9 +26,6 @@ SHELL = /bin/sh
 all:
        echo "No ALL action"
 
-setup:
-       ./Setup.sh
-
 mostlyclean clean distclean maintainer-clean:
        ./Clean.sh $@
 
@@ -53,5 +50,5 @@ stage3:
 unstage3:
        ./Stage.sh unmake 3
 
-.PHONY: all setup mostlyclean clean distclean maintainer-clean tags TAGS
+.PHONY: all mostlyclean clean distclean maintainer-clean tags TAGS
 .PHONY: stage1 unstage1 stage2 unstage2 stage3 unstage3

diff --git a/v7/src/Setup.sh b/v7/src/Setup.sh
index 49270eeb4bd433542a7d971bc1b1b83a53265655..e651dfeab0a06c32702ef7ed02c32ba843e7a5e7 100755 (executable)
--- a/v7/src/Setup.sh
+++ b/v7/src/Setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: Setup.sh,v 1.2 2000/12/08 06:19:43 cph Exp $
+# $Id: Setup.sh,v 1.3 2000/12/08 17:53:58 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -21,6 +21,11 @@
 # Utility to set up the MIT Scheme build directories.
 # The working directory must be the top-level source directory.
 
+if [ ! -x configure ]; then
+    echo "autoconf"
+    autoconf
+fi
+
 maybe_mkdir ()
 {
     if [ ! -e ${1} ]; then