Misc cleanup for doc/*/Makefiles.

* doc/misc/Makefile.in (SHELL): Set it.
(info): Move the mkdir dependency to the individual info files.
(mostlyclean): Tidy up.
(clean): Only delete the specific dvi and pdf files.
(maintainer-clean): Be more restrictive in what we delete.

* doc/lispref/Makefile.in: Rearrange to more closely resemble
doc/emacs/Makefile.
(INSTALL_INFO): Remove unused variable.
(mostlyclean, infoclean, dist): New rules.
(clean): Delete dvi and pdf files.
(maintainer-clean): Remove elisp.oaux, use infoclean.

* doc/lispintro/Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
(INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
($(infodir), html, pdf, infoclean, dist): New rules.
(${infodir}/eintr): Ensure $infodir exists.  Use $@.
(emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html): Use $^.
(.PHONY): Declare clean rules.
(mostlyclean): Delete more temp files.
(clean): Delete specific dvi, pdf and html files.
(maintainer-clean): Use infoclean.
(.NOEXPORT): Remove, unused by any other Makefile.in.

* doc/emacs/Makefile.in (EMACS_XTRA): Add the main source file.
(emacs-xtra.dvi, emacs-xtra.pdf): Remove explicit emacs-xtra.texi.
(mostlyclean): No core files, reorder other files.
(clean): Delete specific dvi and pdf files.
(infoclean, dist): New rules.
(maintainer-clean): Use infoclean.

2 files changed, 57 insertions, 27 deletions

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index ff227a1f119..c8550e5db73 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (SHELL): Use /bin/sh, like every other Makefile.in.
+        (INFO_SOURCES, INFO_TARGETS, DVI_TARGETS): Remove variables.
+        ($(infodir), html, pdf, infoclean, dist): New rules.
+        (${infodir}/eintr): Ensure $infodir exists.  Use $@.
+        (emacs-lisp-intro.dvi, emacs-lisp-intro.pdf, emacs-lisp-intro.html):
+        Use $^.
+        (.PHONY): Declare clean rules.
+        (mostlyclean): Delete more temp files.
+        (clean): Delete specific dvi, pdf and html files.
+        (maintainer-clean): Use infoclean.
+        (.NOEXPORT): Remove, unused by any other Makefile.in.
+
 2010-09-21  Glenn Morris  <rgm@gnu.org>
 
         * cons-1.eps, cons-2.eps, cons-2a.eps, cons-3.eps, cons-4.eps:
diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index d834ef70889..14103b8a26d 100644
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -1,7 +1,8 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-#   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -18,8 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-
-SHELL = @SHELL@
+SHELL = /bin/sh
 
 srcdir = @srcdir@
 VPATH = @srcdir@
@@ -28,12 +28,6 @@ infodir = ../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
-INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi
-# The file name eintr must fit within 5 characters, to allow for
-# -NN extensions to fit into DOS 8+3 limits without clashing
-INFO_TARGETS = ${infodir}/eintr
-DVI_TARGETS = emacs-lisp-intro.dvi
-
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
@@ -41,37 +35,59 @@ DVIPS = dvips
 
 .SUFFIXES: .dvi .ps .texi
 
-info: $(INFO_TARGETS)
+info: ${infodir}/eintr
+
+$(infodir):
+        mkdir $@
 
-dvi: $(DVI_TARGETS)
+dvi: emacs-lisp-intro.dvi
+html: emacs-lisp-intro.html
+pdf: emacs-lisp-intro.pdf
 
-${infodir}/eintr: ${INFO_SOURCES}
-        cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr
+# The file name eintr must fit within 5 characters, to allow for
+# -NN extensions to fit into DOS 8+3 limits without clashing.
+${infodir}/eintr: $(infodir) ${srcdir}/emacs-lisp-intro.texi
+        cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $@
 
-emacs-lisp-intro.dvi: ${INFO_SOURCES}
-        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
+        $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $^
 
-emacs-lisp-intro.pdf: ${INFO_SOURCES}
-        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
+        $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $^
 
-emacs-lisp-intro.html: $(INFO_SOURCES)
-        $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi
+emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
+        $(MAKEINFO) --html -o $@ $^
 
 .dvi.ps:
         $(DVIPS) $< -o $@
 
+.PHONY: mostlyclean clean distclean maintainer-clean infoclean
+
 mostlyclean:
-        rm -f  *.log *.cp *.fn *.ky *.pg *.vr *.tp
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
 
 clean: mostlyclean
-        rm -f *.dvi
+        rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf
+        rm -rf emacs-lisp-intro.html/
 
 distclean: clean
 
-maintainer-clean: distclean
-        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
-        cd $(infodir); rm -f eintr eintr-[1-9]
+infoclean:
+        -cd $(infodir) && rm -f eintr eintr-[1-9]
+
+maintainer-clean: distclean infoclean
+
+dist:
+        rm -rf lispintro
+        mkdir lispintro
+        cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \
+          ${texinfodir}/texinfo.tex \
+          ${srcdir}/ChangeLog* ${srcdir}/README lispintro/
+        sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
+          -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          ${srcdir}/Makefile.in > lispintro/Makefile
+        tar -cf emacs-lisp-intro-texi.tar lispintro
+        rm -rf lispintro
 
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
+### Makefile ends here