From f52c1a36c4dd5882f0022c79d3b3310264c049fe Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Sat, 16 Oct 2004 06:02:55 +0000 Subject: [PATCH] Make output names and compilation consistent. Assumes GNU Make. --- v7/doc/Makefile.in | 4 +- v7/doc/configure.ac | 3 +- v7/doc/imail/Makefile.in | 107 +------------------------- v7/doc/imail/imail.texinfo | 4 +- v7/doc/index.html | 12 +-- v7/doc/make-common.in | 125 +++++++++++++++++++++++++++++++ v7/doc/ref-manual/Makefile.in | 101 +------------------------ v7/doc/ref-manual/io.texi | 6 +- v7/doc/ref-manual/scheme.texinfo | 10 ++- v7/doc/sos/Makefile.in | 107 +------------------------- v7/doc/sos/sos.texinfo | 4 +- v7/doc/user-manual/Makefile.in | 107 +------------------------- v7/doc/user-manual/user.texinfo | 4 +- 13 files changed, 164 insertions(+), 430 deletions(-) create mode 100644 v7/doc/make-common.in diff --git a/v7/doc/Makefile.in b/v7/doc/Makefile.in index de8f52212..471cdbe54 100644 --- 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 cc7986b24..788d216c1 100644 --- 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 fba497f7b..844050c20 100644 --- 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 9f37044cb..4cb8feabd 100644 --- 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 5f30738e0..1b8c19d24 100644 --- a/v7/doc/index.html +++ b/v7/doc/index.html @@ -4,17 +4,17 @@ -

MIT/GNU Scheme Documentation

+

MIT/GNU Scheme Documentation

-
+
The following MIT/GNU Scheme manuals are available here: diff --git a/v7/doc/make-common.in b/v7/doc/make-common.in new file mode 100644 index 000000000..e757b2460 --- /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 b7bf0fea3..14dfd7e6d 100644 --- 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 08a4b1f36..b3dd18a15 100644 --- 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{