Make output names and compilation consistent. Assumes GNU Make.

diff --git a/v7/doc/Makefile.in b/v7/doc/Makefile.in
index de8f52212d408df63fef09d7da309835fca4bc05..471cdbe54a39aea63b031af2e973f1137575409c 100644 (file)
--- a/v7/doc/Makefile.in
+++ b/v7/doc/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.11 2004/10/14 04:10:43 cph Exp $
+# $Id: Makefile.in,v 1.12 2004/10/16 06:02:54 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
 #
@@ -64,7 +64,7 @@ psdir = @psdir@
 INST_TARGETS = @INST_TARGETS@
 
 SUBDIRS = imail ref-manual sos user-manual
-DISTCLEAN_FILES = Makefile */Makefile config.cache config.log config.status
+DISTCLEAN_FILES = Makefile make-common config.log config.status
 
 all:
        @for D in $(SUBDIRS); do \

diff --git a/v7/doc/configure.ac b/v7/doc/configure.ac
index cc7986b2480320b2ca10a519b72ab3c563f4a501..788d216c13eceb93d8d39b000983355f39199b39 100644 (file)
--- a/v7/doc/configure.ac
+++ b/v7/doc/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([MIT/GNU Scheme documentation],
        [7.7.91],
        [bug-mit-scheme@gnu.org],
        [mit-scheme-doc])
-AC_REVISION([$Id: configure.ac,v 1.3 2004/10/14 04:10:14 cph Exp $])
+AC_REVISION([$Id: configure.ac,v 1.4 2004/10/16 06:02:54 cph Exp $])
 AC_CONFIG_SRCDIR([ref-manual/scheme.texinfo])
 
 AC_COPYRIGHT(
@@ -78,6 +78,7 @@ AC_SUBST([INST_TARGETS])
 
 AC_CONFIG_FILES([
        Makefile
+       make-common
        imail/Makefile
        ref-manual/Makefile
        sos/Makefile

diff --git a/v7/doc/imail/Makefile.in b/v7/doc/imail/Makefile.in
index fba497f7befef94307900994c2a9e0a3a006ac99..844050c201ce59a29b6c010dc2043685d35e8de7 100644 (file)
--- a/v7/doc/imail/Makefile.in
+++ b/v7/doc/imail/Makefile.in
@@ -1,5 +1,5 @@
 
-# $Id: Makefile.in,v 1.7 2004/10/14 04:03:19 cph Exp $
+# $Id: Makefile.in,v 1.8 2004/10/16 06:02:55 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
 #
@@ -20,111 +20,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# **** BEGIN BOILERPLATE ****
-
-SHELL = @SHELL@
-
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-top_builddir = .
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-LN_S = @LN_S@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-# **** END BOILERPLATE ****
-
-htmldir = @htmldir@
-pdfdir = @pdfdir@
-psdir = @psdir@
-
-INFO_TARGET = mit-scheme-imail.info
-
-all: $(INFO_TARGET) imail.html imail.pdf imail.ps
-
-$(INFO_TARGET): imail.texinfo
-       rm -f $(INFO_TARGET)*
-       makeinfo --output=$(INFO_TARGET) imail.texinfo
-
-imail.html: imail.texinfo
-       rm -f imail*.html
-       texi2html -split_chapter imail.texinfo
-
-imail.pdf: imail.texinfo
-       texi2pdf imail.texinfo
-
-imail.ps: imail.dvi
-       dvips -o $@ $^
-
-imail.dvi: imail.texinfo
-       texi2dvi imail.texinfo
-
-AUX_SUFFIXES = aux log toc
-INDEX_SUFFIXES = cp fn ky pg tp vr
-
-mostlyclean:
-       @for S in $(AUX_SUFFIXES); do \
-           echo "rm -f imail.$${S}";\
-           rm -f imail.$${S};\
-       done
-       @for S in $(INDEX_SUFFIXES); do \
-           echo "rm -f imail.$${S}";\
-           rm -f imail.$${S};\
-           echo "rm -f imail.$${S}s";\
-           rm -f imail.$${S}s;\
-       done
-       rm -f imail.dvi
-
-clean: mostlyclean
-       rm -f $(INFO_TARGET)* imail*.html imail.pdf imail.ps
-
-distclean: clean
-
-maintainer-clean: distclean
-
-# The install rules depend on macro variables passwd down from the
-# makefile in the top-level documentation directory.
-
-install-info: $(INFO_TARGET)
-       -rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-       $(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
-
-install-info-gz: install-info
-       gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-
-install-html: imail.html
-       $(INSTALL_DATA) imail*.html $(DESTDIR)$(htmldir)/.
-
-install-pdf: imail.pdf
-       $(INSTALL_DATA) imail.pdf $(DESTDIR)$(pdfdir)/.
 
-install-ps: imail.ps
-       $(INSTALL_DATA) imail.ps $(DESTDIR)$(psdir)/.
+SOURCES = imail.texinfo
+TARGET_ROOT = mit-scheme-imail
 
-.PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: install-info install-html install-pdf install-ps
+include $(top_srcdir)/make-common

diff --git a/v7/doc/imail/imail.texinfo b/v7/doc/imail/imail.texinfo
index 9f37044cb9c3edbb7387bd57511125a563f1d856..4cb8feabdbf99373fb24ff74146c107e178027d3 100644 (file)
--- a/v7/doc/imail/imail.texinfo
+++ b/v7/doc/imail/imail.texinfo
@@ -2,9 +2,9 @@
 @iftex
 @finalout
 @end iftex
-@comment $Id: imail.texinfo,v 1.32 2004/10/14 03:51:49 cph Exp $
+@comment $Id: imail.texinfo,v 1.33 2004/10/16 06:02:55 cph Exp $
 @comment %**start of header (This is for running Texinfo on a region.)
-@setfilename imail.info
+@setfilename mit-scheme-imail
 @settitle IMAIL User's Manual
 @comment %**end of header (This is for running Texinfo on a region.)
 @setchapternewpage on

diff --git a/v7/doc/index.html b/v7/doc/index.html
index 5f30738e0c69984e5bf3ebaf1706eac887215f01..1b8c19d244265a830a56dd3851f96fa88769e4bc 100644 (file)
--- a/v7/doc/index.html
+++ b/v7/doc/index.html
@@ -4,17 +4,17 @@
 
 <body>
 
-<h1 align=center>MIT/GNU Scheme Documentation</h1>
+<h1 align="center">MIT/GNU Scheme Documentation</h1>
 
-<hr>
+<hr />
 
 The following MIT/GNU Scheme manuals are available here:
 
 <ul>
-<li><a href="scheme.html">MIT/GNU Scheme Reference</a>
-<li><a href="user.html">MIT/GNU Scheme User's Manual</a>
-<li><a href="sos.html">SOS Reference Manual</a>
-<li><a href="imail.html">IMAIL User's Manual</a>
+<li><a href="mit-scheme-ref/index.html">MIT/GNU Scheme Reference</a></li>
+<li><a href="mit-scheme-user/index.html">MIT/GNU Scheme User's Manual</a></li>
+<li><a href="mit-scheme-sos/index.html">SOS Reference Manual</a></li>
+<li><a href="mit-scheme-imail/index.html">IMAIL User's Manual</a></li>
 </ul>
 
 </body>

diff --git a/v7/doc/make-common.in b/v7/doc/make-common.in
new file mode 100644 (file)
index 0000000..e757b24
--- /dev/null
+++ b/v7/doc/make-common.in
@@ -0,0 +1,125 @@
+
+# $Id: make-common.in,v 1.1 2004/10/16 06:02:55 cph Exp $
+#
+# Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
+#
+# This file is part of MIT/GNU Scheme.
+#
+# MIT/GNU Scheme is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# MIT/GNU Scheme is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with MIT/GNU Scheme; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# **** BEGIN BOILERPLATE ****
+
+SHELL = @SHELL@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+top_builddir = .
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+
+LN_S = @LN_S@
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+
+# **** END BOILERPLATE ****
+
+htmldir = @htmldir@
+pdfdir = @pdfdir@
+psdir = @psdir@
+
+INST_TARGETS = @INST_TARGETS@
+
+INFO_TARGET = $(TARGET_ROOT).info
+HTML_TARGET = $(TARGET_ROOT)
+DVI_TARGET = $(TARGET_ROOT).dvi
+PDF_TARGET = $(TARGET_ROOT).pdf
+PS_TARGET = $(TARGET_ROOT).ps
+
+TEX_OPTIONS = --quiet
+
+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))
+
+$(HTML_TARGET)/index.html: $(SOURCES)
+       rm -rf $(HTML_TARGET)
+       makeinfo --html $(word 1, $(SOURCES))
+
+$(PDF_TARGET): $(SOURCES)
+       texi2pdf $(TEX_OPTIONS) --output=$@ $(word 1, $(SOURCES))
+
+$(PS_TARGET): $(SOURCES)
+       -rm -f $(DVI_TARGET)
+       texi2dvi $(TEX_OPTIONS) --output=$(DVI_TARGET) $(word 1, $(SOURCES))
+       dvips -q -o $@ $(DVI_TARGET)
+       rm -f $(DVI_TARGET)
+
+mostlyclean:
+
+clean: mostlyclean
+       rm -f $(INFO_TARGET)* $(PDF_TARGET) $(PS_TARGET)
+       rm -rf $(HTML_TARGET)
+
+distclean: clean
+       rm -f Makefile
+
+maintainer-clean: distclean
+
+# The install rules depend on macro variables passwd down from the
+# makefile in the top-level documentation directory.
+
+install: install-info-gz $(INST_TARGETS)
+
+install-info: $(INFO_TARGET)
+       -rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
+       $(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
+
+install-info-gz: install-info
+       gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
+
+install-html: $(HTML_TARGET)/index.html
+       -rm -rf $(DESTDIR)$(htmldir)/$(HTML_TARGET)
+       $(mkinstalldirs) $(DESTDIR)$(htmldir)/$(HTML_TARGET)
+       $(INSTALL_DATA) $(HTML_TARGET)/* $(DESTDIR)$(htmldir)/$(HTML_TARGET)/.
+
+install-pdf: $(PDF_TARGET)
+       $(INSTALL_DATA) $(PDF_TARGET) $(DESTDIR)$(pdfdir)/.
+
+install-ps: $(PS_TARGET)
+       $(INSTALL_DATA) $(PS_TARGET) $(DESTDIR)$(psdir)/.
+
+.PHONY: all mostlyclean clean distclean maintainer-clean
+.PHONY: install-info install-html install-pdf install-ps

diff --git a/v7/doc/ref-manual/Makefile.in b/v7/doc/ref-manual/Makefile.in
index b7bf0fea3f21ae4f9450e4d9fc27ef50c8baa6ab..14dfd7e6d1f7739e543bcf5ae32d8662a30986e9 100644 (file)
--- a/v7/doc/ref-manual/Makefile.in
+++ b/v7/doc/ref-manual/Makefile.in
@@ -1,5 +1,5 @@
 
-# $Id: Makefile.in,v 1.9 2004/10/15 05:52:25 cph Exp $
+# $Id: Makefile.in,v 1.10 2004/10/16 06:02:55 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
 #
@@ -20,48 +20,10 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# **** BEGIN BOILERPLATE ****
-
-SHELL = @SHELL@
-
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-top_builddir = .
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-LN_S = @LN_S@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-# **** END BOILERPLATE ****
-
-htmldir = @htmldir@
-pdfdir = @pdfdir@
-psdir = @psdir@
 
 SOURCES = \
     scheme.texinfo \
@@ -87,65 +49,6 @@ SOURCES = \
     strings.texi \
     vectors.texi \
     win32-packaging.texi
-
 TARGET_ROOT = mit-scheme-ref
-INFO_TARGET = $(TARGET_ROOT).info
-HTML_TARGET = $(TARGET_ROOT)
-DVI_TARGET = $(TARGET_ROOT).dvi
-PDF_TARGET = $(TARGET_ROOT).pdf
-PS_TARGET = $(TARGET_ROOT).ps
-
-TEXI2DVI_OPTIONS = --quiet
-
-all: $(INFO_TARGET) $(HTML_TARGET)/index.html $(PDF_TARGET) $(PS_TARGET)
-
-$(INFO_TARGET): $(SOURCES)
-       rm -f $(INFO_TARGET)*
-       makeinfo --output=$(INFO_TARGET) scheme.texinfo
-
-$(HTML_TARGET)/index.html: $(SOURCES)
-       rm -rf $(HTML_TARGET)
-       makeinfo --html scheme.texinfo
-
-$(PDF_TARGET): $(SOURCES)
-       texi2pdf $(TEXI2DVI_OPTIONS) --output=$@ scheme.texinfo
-
-$(PS_TARGET): $(SOURCES)
-       -rm -f $(DVI_TARGET)
-       texi2dvi $(TEXI2DVI_OPTIONS) --output=$(DVI_TARGET) scheme.texinfo
-       dvips -q -o $@ $(DVI_TARGET)
-       rm -f $(DVI_TARGET)
-
-mostlyclean:
-
-clean: mostlyclean
-       rm -f $(INFO_TARGET)* $(PDF_TARGET) $(PS_TARGET)
-       rm -rf $(HTML_TARGET)
-
-distclean: clean
-
-maintainer-clean: distclean
-
-# The install rules depend on macro variables passwd down from the
-# makefile in the top-level documentation directory.
-
-install-info: $(INFO_TARGET)
-       -rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-       $(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
-
-install-info-gz: install-info
-       gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-
-install-html: $(HTML_TARGET)/index.html
-       -rm -rf $(DESTDIR)$(htmldir)/$(HTML_TARGET)
-       $(mkinstalldirs) $(DESTDIR)$(htmldir)/$(HTML_TARGET)
-       $(INSTALL_DATA) $(HTML_TARGET)/* $(DESTDIR)$(htmldir)/$(HTML_TARGET)/.
-
-install-pdf: $(PDF_TARGET)
-       $(INSTALL_DATA) $(PDF_TARGET) $(DESTDIR)$(pdfdir)/.
-
-install-ps: $(PS_TARGET)
-       $(INSTALL_DATA) $(PS_TARGET) $(DESTDIR)$(psdir)/.
 
-.PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: install-info install-html install-pdf install-ps
+include $(top_srcdir)/make-common

diff --git a/v7/doc/ref-manual/io.texi b/v7/doc/ref-manual/io.texi
index 08a4b1f3601b34a1b611202476ae843b930323da..b3dd18a15023a789aa5b8acca4224bce62072aa5 100644 (file)
--- a/v7/doc/ref-manual/io.texi
+++ b/v7/doc/ref-manual/io.texi
@@ -1,5 +1,5 @@
 @c This file is part of the MIT/GNU Scheme Reference Manual.
-@c $Id: io.texi,v 1.9 2004/10/15 06:00:49 cph Exp $
+@c $Id: io.texi,v 1.10 2004/10/16 06:02:55 cph Exp $
 
 @c Copyright 1991,1992,1993,1994,1995 Massachusetts Institute of Technology
 @c Copyright 1996,1997,1999,2000,2001 Massachusetts Institute of Technology
@@ -3319,10 +3319,10 @@ The @code{xml-declaration} record represents the @samp{<?xml @dots{}
 @findex make-xml-element
 @findex xml-element-name
 @findex xml-element-attributes
-@findex xml-element-contents
+@findex xml-element-content
 @findex set-xml-element-name!
 @findex set-xml-element-attributes!
-@findex set-xml-element-contents!
+@findex set-xml-element-content!
 The @code{xml-element} record represents general @acronym{XML} elements;
 the bulk of a typical @acronym{XML} document consists of these elements.
 @var{Name} is the element name (an @acronym{XML} name).

diff --git a/v7/doc/ref-manual/scheme.texinfo b/v7/doc/ref-manual/scheme.texinfo
index b75220ea0e3fe169d490f71ed7d703aa872de0ab..64d7fbefb1191ab2c500c97c1478c6312a2239f2 100644 (file)
--- a/v7/doc/ref-manual/scheme.texinfo
+++ b/v7/doc/ref-manual/scheme.texinfo
@@ -1,5 +1,5 @@
 \input texinfo @c -*-texinfo-*-
-@comment $Id: scheme.texinfo,v 1.128 2004/10/15 05:58:23 cph Exp $
+@comment $Id: scheme.texinfo,v 1.129 2004/10/16 06:02:55 cph Exp $
 @comment %**start of header (This is for running Texinfo on a region.)
 @setfilename mit-scheme-ref
 @set EDITION 1.102
@@ -16,9 +16,11 @@
 @copying
 This file documents MIT/GNU Scheme @value{VERSION}.
 
-Copyright @copyright{} 1991,1992,1993,1994,1995 Massachusetts Institute of Technology@*
-Copyright @copyright{} 1996,1997,1999,2000,2001 Massachusetts Institute of Technology@*
-Copyright @copyright{} 2002,2003,2004 Massachusetts Institute of Technology@*
+@noindent
+Copyright @copyright{} 1991,1992,1993,1994 Massachusetts Institute of Technology@*
+Copyright @copyright{} 1995,1996,1997,1999 Massachusetts Institute of Technology@*
+Copyright @copyright{} 2000,2001,2002,2003 Massachusetts Institute of Technology@*
+Copyright @copyright{} 2004 Massachusetts Institute of Technology
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document

diff --git a/v7/doc/sos/Makefile.in b/v7/doc/sos/Makefile.in
index 3f39fe34a3382507c9e577014e5eaf2ee66e8fbc..b94a03d696ad3ea616dfc680f167081428583016 100644 (file)
--- a/v7/doc/sos/Makefile.in
+++ b/v7/doc/sos/Makefile.in
@@ -1,5 +1,5 @@
 
-# $Id: Makefile.in,v 2.7 2004/10/14 04:03:27 cph Exp $
+# $Id: Makefile.in,v 2.8 2004/10/16 06:02:55 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
 #
@@ -20,111 +20,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# **** BEGIN BOILERPLATE ****
-
-SHELL = @SHELL@
-
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-top_builddir = .
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-LN_S = @LN_S@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-# **** END BOILERPLATE ****
-
-htmldir = @htmldir@
-pdfdir = @pdfdir@
-psdir = @psdir@
-
-INFO_TARGET = mit-scheme-sos.info
-
-all: $(INFO_TARGET) sos.html sos.pdf sos.ps
-
-$(INFO_TARGET): sos.texinfo
-       rm -f $(INFO_TARGET)*
-       makeinfo --output=$(INFO_TARGET) sos.texinfo
-
-sos.html: sos.texinfo
-       rm -f sos*.html
-       texi2html -split_chapter sos.texinfo
-
-sos.pdf: sos.texinfo
-       texi2pdf sos.texinfo
-
-sos.ps: sos.dvi
-       dvips -o $@ $^
-
-sos.dvi: sos.texinfo
-       texi2dvi sos.texinfo
-
-AUX_SUFFIXES = aux log toc
-INDEX_SUFFIXES = cp fn ky pg tp vr
-
-mostlyclean:
-       @for S in $(AUX_SUFFIXES); do \
-           echo "rm -f sos.$${S}";\
-           rm -f sos.$${S};\
-       done
-       @for S in $(INDEX_SUFFIXES); do \
-           echo "rm -f sos.$${S}";\
-           rm -f sos.$${S};\
-           echo "rm -f sos.$${S}s";\
-           rm -f sos.$${S}s;\
-       done
-       rm -f sos.dvi
-
-clean: mostlyclean
-       rm -f $(INFO_TARGET)* sos*.html sos.pdf sos.ps
-
-distclean: clean
-
-maintainer-clean: distclean
-
-# The install rules depend on macro variables passwd down from the
-# makefile in the top-level documentation directory.
-
-install-info: $(INFO_TARGET)
-       -rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-       $(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
-
-install-info-gz: install-info
-       gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-
-install-html: sos.html
-       $(INSTALL_DATA) sos*.html $(DESTDIR)$(htmldir)/.
-
-install-pdf: sos.pdf
-       $(INSTALL_DATA) sos.pdf $(DESTDIR)$(pdfdir)/.
 
-install-ps: sos.ps
-       $(INSTALL_DATA) sos.ps $(DESTDIR)$(psdir)/.
+SOURCES = sos.texinfo
+TARGET_ROOT = mit-scheme-sos
 
-.PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: install-info install-html install-pdf install-ps
+include $(top_srcdir)/make-common

diff --git a/v7/doc/sos/sos.texinfo b/v7/doc/sos/sos.texinfo
index 94c85316287971188c8c49c0d2a975222be4227a..8d039d411206c71c754bd1ed31ea35edb51337e9 100644 (file)
--- a/v7/doc/sos/sos.texinfo
+++ b/v7/doc/sos/sos.texinfo
@@ -3,7 +3,7 @@
 @finalout
 @end iftex
 @comment %**start of header
-@setfilename sos.info
+@setfilename mit-scheme-sos
 @settitle @value{TITLE}
 @comment %**end of header
 @setchapternewpage odd
@@ -12,7 +12,7 @@
 @syncodeindex pg fn
 @syncodeindex tp fn
 
-@c $Id: sos.texinfo,v 2.15 2004/10/14 03:51:04 cph Exp $
+@c $Id: sos.texinfo,v 2.16 2004/10/16 06:02:55 cph Exp $
 
 @set TITLE The SOS Reference Manual
 @set EDITION 2.11

diff --git a/v7/doc/user-manual/Makefile.in b/v7/doc/user-manual/Makefile.in
index af7be3057775024ceafcc15f378602eae4a20137..c40bd3f7ab1292eda0023fb689e0a39fe3a3ed2d 100644 (file)
--- a/v7/doc/user-manual/Makefile.in
+++ b/v7/doc/user-manual/Makefile.in
@@ -1,5 +1,5 @@
 
-# $Id: Makefile.in,v 1.7 2004/10/14 04:03:55 cph Exp $
+# $Id: Makefile.in,v 1.8 2004/10/16 06:02:55 cph Exp $
 #
 # Copyright 2000,2001,2002,2003,2004 Massachusetts Institute of Technology
 #
@@ -20,111 +20,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# **** BEGIN BOILERPLATE ****
-
-SHELL = @SHELL@
-
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-top_builddir = .
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-LN_S = @LN_S@
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-
-# **** END BOILERPLATE ****
-
-htmldir = @htmldir@
-pdfdir = @pdfdir@
-psdir = @psdir@
-
-INFO_TARGET = mit-scheme-user.info
-
-all: $(INFO_TARGET) user.html user.pdf user.ps
-
-$(INFO_TARGET): user.texinfo
-       rm -f $(INFO_TARGET)*
-       makeinfo --output=$(INFO_TARGET) user.texinfo
-
-user.html: user.texinfo
-       rm -f user*.html
-       texi2html -split_chapter user.texinfo
-
-user.pdf: user.texinfo
-       texi2pdf user.texinfo
-
-user.ps: user.dvi
-       dvips -o $@ $^
-
-user.dvi: user.texinfo
-       texi2dvi user.texinfo
-
-AUX_SUFFIXES = aux log toc
-INDEX_SUFFIXES = cp fn ky pg tp vr nv op
-
-mostlyclean:
-       @for S in $(AUX_SUFFIXES); do \
-           echo "rm -f user.$${S}";\
-           rm -f user.$${S};\
-       done
-       @for S in $(INDEX_SUFFIXES); do \
-           echo "rm -f user.$${S}";\
-           rm -f user.$${S};\
-           echo "rm -f user.$${S}s";\
-           rm -f user.$${S}s;\
-       done
-       rm -f user.dvi
-
-clean: mostlyclean
-       rm -f $(INFO_TARGET)* user*.html user.pdf user.ps
-
-distclean: clean
-
-maintainer-clean: distclean
-
-# The install rules depend on macro variables passwd down from the
-# makefile in the top-level documentation directory.
-
-install-info: $(INFO_TARGET)
-       -rm -f $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-       $(INSTALL_DATA) $(INFO_TARGET)* $(DESTDIR)$(infodir)/.
-
-install-info-gz: install-info
-       gzip -v $(DESTDIR)$(infodir)/$(INFO_TARGET)*
-
-install-html: user.html
-       $(INSTALL_DATA) user*.html $(DESTDIR)$(htmldir)/.
-
-install-pdf: user.pdf
-       $(INSTALL_DATA) user.pdf $(DESTDIR)$(pdfdir)/.
 
-install-ps: user.ps
-       $(INSTALL_DATA) user.ps $(DESTDIR)$(psdir)/.
+SOURCES = user.texinfo
+TARGET_ROOT = mit-scheme-user
 
-.PHONY: all mostlyclean clean distclean maintainer-clean
-.PHONY: install-info install-html install-pdf install-ps
+include $(top_srcdir)/make-common

diff --git a/v7/doc/user-manual/user.texinfo b/v7/doc/user-manual/user.texinfo
index 8a3fe96ba349f9bca40e61267ddd35c60cfe404f..7b4e5800d85cda5a7fa7b2ff23c92f38db7cf49b 100644 (file)
--- a/v7/doc/user-manual/user.texinfo
+++ b/v7/doc/user-manual/user.texinfo
@@ -2,9 +2,9 @@
 @iftex
 @finalout
 @end iftex
-@comment $Id: user.texinfo,v 1.103 2004/10/14 03:49:52 cph Exp $
+@comment $Id: user.texinfo,v 1.104 2004/10/16 06:02:55 cph Exp $
 @comment %**start of header (This is for running Texinfo on a region.)
-@setfilename user.info
+@setfilename mit-scheme-user
 @settitle MIT/GNU Scheme User's Manual
 @comment %**end of header (This is for running Texinfo on a region.)
 @setchapternewpage odd