From a155ae96aeb6db2eee713804b93ac46c11c5ba57 Mon Sep 17 00:00:00 2001
From: Matt Birkholz <matt@birkholz.chandler.az.us>
Date: Sun, 29 Nov 2009 14:23:10 -0700
Subject: [PATCH] Clean up texinfo auxiliary files (e.g. imail.aux).

* doc/make-common.in (clean): Use new TEXINFO_ROOT variable to delete
the texinfo auxiliary files.  Also used it in place of the GNU make
specific "word" function.

* doc/imail/Makefile.in (clean): Set TEXINFO_ROOT.
* doc/sos/Makefile.in (clean): ditto
* doc/ref-manual/ref-manual (clean): ditto
* doc/user-manual/Makefile.in  (clean): ditto
---
 doc/imail/Makefile.in       |  3 ++-
 doc/make-common.in          | 12 ++++++++----
 doc/ref-manual/Makefile.in  |  5 +++--
 doc/sos/Makefile.in         |  3 ++-
 doc/user-manual/Makefile.in |  3 ++-
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/doc/imail/Makefile.in b/doc/imail/Makefile.in
index 17df6b6a8..fe25e2dea 100644
--- a/doc/imail/Makefile.in
+++ b/doc/imail/Makefile.in
@@ -26,7 +26,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES = imail.texinfo
 TARGET_ROOT = mit-scheme-imail
+TEXINFO_ROOT = imail
+SOURCES = $(TEXINFO_ROOT).texinfo
 
 include $(top_srcdir)/make-common
diff --git a/doc/make-common.in b/doc/make-common.in
index af33bbbad..5e3632fe7 100644
--- a/doc/make-common.in
+++ b/doc/make-common.in
@@ -74,18 +74,18 @@ all: $(INFO_TARGET) $(HTML_TARGET)/index.html $(PDF_TARGET) $(PS_TARGET)
 
 $(INFO_TARGET): $(SOURCES)
 	rm -f $(INFO_TARGET)*
-	makeinfo --output=$(INFO_TARGET) $(word 1, $(SOURCES))
+	makeinfo --output=$(INFO_TARGET) $(TEXINFO_ROOT).texinfo
 
 $(HTML_TARGET)/index.html: $(SOURCES)
 	rm -rf $(HTML_TARGET)
-	makeinfo --html $(word 1, $(SOURCES))
+	makeinfo --html $(TEXINFO_ROOT).texinfo
 
 $(PDF_TARGET): $(SOURCES)
-	texi2pdf $(TEX_OPTIONS) --output=$@ $(word 1, $(SOURCES))
+	texi2pdf $(TEX_OPTIONS) --output=$@ $(TEXINFO_ROOT).texinfo
 
 $(PS_TARGET): $(SOURCES)
 	-rm -f $(DVI_TARGET)
-	texi2dvi $(TEX_OPTIONS) --output=$(DVI_TARGET) $(word 1, $(SOURCES))
+	texi2dvi $(TEX_OPTIONS) --output=$(DVI_TARGET) $(TEXINFO_ROOT).texinfo
 	dvips -q -o $@ $(DVI_TARGET)
 	rm -f $(DVI_TARGET)
 
@@ -94,6 +94,10 @@ mostlyclean:
 clean: mostlyclean
 	rm -f $(INFO_TARGET)* $(PDF_TARGET) $(PS_TARGET)
 	rm -rf $(HTML_TARGET)
+	rm -rf $(TEXINFO_ROOT).aux $(TEXINFO_ROOT).log $(TEXINFO_ROOT).toc
+	rm -rf $(TEXINFO_ROOT).pg $(TEXINFO_ROOT).tp
+	rm -rf $(TEXINFO_ROOT).cp* $(TEXINFO_ROOT).fn* $(TEXINFO_ROOT).ky*
+	rm -rf $(TEXINFO_ROOT).nv* $(TEXINFO_ROOT).op* $(TEXINFO_ROOT).vr*
 
 distclean: clean
 	rm -f Makefile
diff --git a/doc/ref-manual/Makefile.in b/doc/ref-manual/Makefile.in
index e7e79db96..b6c23bf82 100644
--- a/doc/ref-manual/Makefile.in
+++ b/doc/ref-manual/Makefile.in
@@ -26,8 +26,10 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
+TARGET_ROOT = mit-scheme-ref
+TEXINFO_ROOT = scheme
 SOURCES = \
-    scheme.texinfo \
+    $(TEXINFO_ROOT).texinfo \
     acknowledgements.texi \
     associations.texi \
     binding-index.texi \
@@ -50,6 +52,5 @@ SOURCES = \
     strings.texi \
     vectors.texi \
     win32-packaging.texi
-TARGET_ROOT = mit-scheme-ref
 
 include $(top_srcdir)/make-common
diff --git a/doc/sos/Makefile.in b/doc/sos/Makefile.in
index 3bd4920c4..d42c6dff2 100644
--- a/doc/sos/Makefile.in
+++ b/doc/sos/Makefile.in
@@ -26,7 +26,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES = sos.texinfo
 TARGET_ROOT = mit-scheme-sos
+TEXINFO_ROOT = sos
+SOURCES = $(TEXINFO_ROOT).texinfo
 
 include $(top_srcdir)/make-common
diff --git a/doc/user-manual/Makefile.in b/doc/user-manual/Makefile.in
index a2a0eb06c..58dca4ac6 100644
--- a/doc/user-manual/Makefile.in
+++ b/doc/user-manual/Makefile.in
@@ -26,7 +26,8 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SOURCES = user.texinfo
 TARGET_ROOT = mit-scheme-user
+TEXINFO_ROOT = user
+SOURCES = $(TEXINFO_ROOT).texinfo
 
 include $(top_srcdir)/make-common
-- 
2.25.1