From b9cf85cc1f62f52c3eceb4797623063752b3ef57 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 8 Dec 2000 19:10:13 +0000
Subject: [PATCH] Use autoconf for top-level Makefile.

---
 v7/src/Makefile.in                      | 10 +++-------
 v7/src/microcode/makegen/Makefile.in.in | 18 +++++++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/v7/src/Makefile.in b/v7/src/Makefile.in
index 0b2b50630..5f7eb0989 100644
--- a/v7/src/Makefile.in
+++ b/v7/src/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.3 2000/12/08 19:07:28 cph Exp $
+# $Id: Makefile.in,v 1.4 2000/12/08 19:10:13 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -80,7 +80,8 @@ tags TAGS:
 	$(srcdir)/Tags.sh $(SUBDIRS)
 
 install: all
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	( cd microcode; $(MAKE) $@ )
+
 	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)
 	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC
 	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)/SRC/edwin
@@ -92,11 +93,6 @@ install: all
 	$(mkinstalldirs) $(DESTDIR)$(EODIR)
 	$(mkinstalldirs) $(DESTDIR)$(RODIR)
 
-	$(INSTALL_PROGRAM) microcode/scheme $(DESTDIR)$(bindir)/.
-	$(INSTALL_PROGRAM) microcode/bchscheme $(DESTDIR)$(bindir)/.
-	$(INSTALL_PROGRAM) microcode/gcdrone $(DESTDIR)$(AUXDIR)/.
-
-	$(INSTALL_DATA) microcode/utabmd.bin $(DESTDIR)$(AUXDIR)/.
 	$(INSTALL_DATA) $(srcdir)/etc/optiondb.scm $(DESTDIR)$(AUXDIR)/.
 	$(INSTALL_DATA) $(srcdir)/etc/TUTORIAL $(DESTDIR)$(EDDIR)/etc/.
 	$(INSTALL_DATA) $(srcdir)/etc/mime.types $(DESTDIR)$(EDDIR)/etc/.
diff --git a/v7/src/microcode/makegen/Makefile.in.in b/v7/src/microcode/makegen/Makefile.in.in
index ef7291486..70a354741 100644
--- a/v7/src/microcode/makegen/Makefile.in.in
+++ b/v7/src/microcode/makegen/Makefile.in.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in.in,v 1.12 2000/12/08 18:08:42 cph Exp $
+# $Id: Makefile.in.in,v 1.13 2000/12/08 19:07:28 cph Exp $
 #
 # Copyright (c) 2000 Massachusetts Institute of Technology
 #
@@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 # **** Tool configuration ****
 
-auxdir = $(libdir)/mit-scheme
+AUXDIR = $(libdir)/mit-scheme
 
 CC = @CC@
 M4 = $(srcdir)/makegen/m4.sh
@@ -64,7 +64,7 @@ AS = as
 TAR = tar
 GZIP_ENV = --best
 
-DEFS = -DMIT_SCHEME -DDEFAULT_LIBRARY_PATH=\"$(auxdir)\" @DEFS@ \
+DEFS = -DMIT_SCHEME -DDEFAULT_LIBRARY_PATH=\"$(AUXDIR)\" @DEFS@ \
        -I. -I$(srcdir) -I.
 CFLAGS = @CFLAGS@
 X_CFLAGS = @X_CFLAGS@
@@ -248,22 +248,22 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	done
 
 install-auxPROGRAMS: $(aux_PROGRAMS)
-	$(mkinstalldirs) $(DESTDIR)$(auxdir)
+	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)
 	@list='$(aux_PROGRAMS)'; \
 	for p in $$list; do \
 	    if test -f $$p; then \
-		echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(auxdir)/."; \
-		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(auxdir)/.; \
+		echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(AUXDIR)/."; \
+		$(INSTALL_PROGRAM) $$p $(DESTDIR)$(AUXDIR)/.; \
 	    fi; \
 	done
 
 install-auxDATA: $(aux_DATA)
-	$(mkinstalldirs) $(DESTDIR)$(auxdir)
+	$(mkinstalldirs) $(DESTDIR)$(AUXDIR)
 	@list='$(aux_DATA)'; \
 	for p in $$list; do \
 	    if test -f $$p; then \
-		echo "  $(INSTALL_DATA) $$p $(DESTDIR)$(auxdir)/."; \
-		$(INSTALL_DATA) $$p $(DESTDIR)$(auxdir)/.; \
+		echo "  $(INSTALL_DATA) $$p $(DESTDIR)$(AUXDIR)/."; \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(AUXDIR)/.; \
 	    fi; \
 	done
 
-- 
2.25.1