Merge from emacs-23

[bpt/emacs.git] / doc / lispref / Makefile.in

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index e91aea5..bc13a63 100644 (file)
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
 # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -26,21 +26,16 @@ srcdir = @srcdir@
 # Tell make where to find source files; this is needed for the makefiles.
 VPATH=@srcdir@
 
-emacsver=@version@             # eg 23.0.60
-
 infodir = ../../info
-usermanualdir = $(srcdir)/../emacs
-miscmanualdir = $(srcdir)/../misc
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
 TEXI2DVI = texi2dvi
+TEXI2PDF = texi2pdf
 SHELL = /bin/sh
 INSTALL_INFO = install-info
 MAKEINFO = makeinfo --force
 
-# The name of the manual:
-VERSION=2.9
-manual = elisp-manual-$(emacsver)-$(VERSION)
-
 # List of all the texinfo files in the manual:
 
 srcs = \
@@ -107,21 +102,14 @@ $(infodir)/elisp: $(srcs)
        cd $(srcdir); $(MAKEINFO) -I. -I$(infodir) elisp.texi -o $(infodir)/elisp
 
 elisp.dvi: $(srcs)
-       $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/elisp.texi
+       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
 
-# This is for use in a separate distro of the Emacs Lisp manual.
-install: elisp
-       $(srcdir)/mkinstalldirs $(infodir)
-       cp elisp elisp-[1-9] elisp-[1-9][0-9] $(infodir)
-       ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/elisp
-
-# This is for use in a separate distro of the Emacs Lisp manual.
-elisp: $(srcs)
-       $(MAKEINFO) -I. -I$(srcdir) $(srcdir)/elisp.texi
+elisp.pdf: $(srcs)
+       $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $(srcdir)/elisp.texi
 
 clean:
        rm -f *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
-              *.vr *.vrs *.pg *.pgs *.ky *.kys
+              *.vr *.vrs *.pg *.pgs *.ky *.kys elisp[12]*
        rm -f make.out core
 
 distclean: clean
@@ -129,19 +117,3 @@ distclean: clean
 maintainer-clean: clean
        rm -f elisp.dvi elisp.oaux
        cd $(infodir); rm -f elisp elisp-[1-9] elisp-[1-9][0-9]
-
-dist: $(infodir)/elisp elisp.dvi
-       -rm -rf temp
-       -mkdir temp
-       -mkdir temp/$(manual)
-       -ln $(srcdir)/README $(srcdir)/configure.in $(srcdir)/configure \
- $(srcdir)/Makefile.in $(srcs) \
- $(miscmanualdir)/texinfo.tex \
- elisp.dvi elisp.aux elisp.??s \
- $(infodir)/elisp $(infodir)/elisp-[1-9] $(infodir)/elisp-[1-9][0-9] \
- temp/$(manual)
-       -(cd temp/$(manual); rm -f mkinstalldirs)
-       cp $(srcdir)/mkinstalldirs temp/$(manual)
-       (cd temp/$(manual); rm -f *~)
-       (cd temp; tar chf - $(manual)) | gzip > $(manual).tar.gz
-       -rm -rf temp