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, 34 insertions, 9 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3cb96fe8fbe..1c6ddb9bdfa 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-06  Glenn Morris  <rgm@gnu.org>
+
+        * 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.
+
 2010-10-04  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (dvi, pdf, $(infodir)): New targets.
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 7ef19febbad..760cfcc0bd3 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -19,6 +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 = /bin/sh
 
 # Standard configure variables.
 srcdir = @srcdir@
@@ -30,11 +31,9 @@ infodir = ../../info
 # Directory with the (customized) texinfo.tex file.
 texinfodir = $(srcdir)/../misc
 
+MAKEINFO = makeinfo --force
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
-SHELL = /bin/sh
-INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
 
 # List of all the texinfo files in the manual:
 
@@ -109,16 +108,34 @@ elisp.dvi: $(srcs)
 elisp.pdf: $(srcs)
         $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
 
-.PHONY: clean distclean maintainer-clean
+.PHONY: mostlyclean clean distclean maintainer-clean infoclean
+
+## [12] stuff is from two-volume.make.
+mostlyclean:
+        rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \
+          *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs
+        rm -f elisp[12]*
 
-clean:
-        rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys elisp[12]*
+clean: mostlyclean
+        rm -f elisp.dvi elisp.pdf vol[12].pdf
 
 distclean: clean
 
-maintainer-clean: clean
-        rm -f elisp.dvi elisp.pdf elisp.oaux
+infoclean:
         -cd $(infodir) && rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
 
+maintainer-clean: distclean infoclean
+
+## Note this excludes the two-volume stuff.
+dist:
+        rm -rf lispref
+        mkdir lispref
+        cp ${srcdir}/*.texi ${texinfodir}/texinfo.tex \
+          ${srcdir}/ChangeLog* ${srcdir}/README lispref/
+        sed -e 's/@sr[c]dir@/./' -e 's/\(texinfodir *=\).*/\1 ./' \
+          -e 's/\(infodir *=\).*/\1 ./' -e 's/^\(clean:.*\)/\1 infoclean/' \
+          ${srcdir}/Makefile.in > lispref/Makefile
+        tar -cf elisp-texi.tar lispref
+        rm -rf lispref
+
 ### Makefile ends here