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

diff --git a/doc/imail/Makefile.in b/doc/imail/Makefile.in
index 17df6b6a87554e2ab9297a1ed19c02718ca07735..fe25e2dea2c8dff3dd3446d27840ec3ea84f3f7b 100644 (file)
--- 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 af33bbbad533928925177503a96b1e5f67278d75..5e3632fe7ea9353fd92b9ed4ff2cabc61cefb48e 100644 (file)
--- 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 e7e79db96d94c8561beefeb7f17d683c98a98e60..b6c23bf82de25bb4151e70be0dd3076b4bbb511d 100644 (file)
--- 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 3bd4920c40f582fdd7399c2d38f8a0ab444c7cbf..d42c6dff25547a6c8359c994bac06918c00af5c4 100644 (file)
--- 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 a2a0eb06c34369bed855a2a76d61aebebe02377b..58dca4ac629dd9827ee3d568d132f657b8d5df79 100644 (file)
--- 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