Merge from emacs-23

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

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 888c295..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, 2009
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 #   Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
@@ -27,9 +27,11 @@ srcdir = @srcdir@
 VPATH=@srcdir@
 
 infodir = ../../info
-usermanualdir = $(srcdir)/../emacs
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
 TEXI2DVI = texi2dvi
+TEXI2PDF = texi2pdf
 SHELL = /bin/sh
 INSTALL_INFO = install-info
 MAKEINFO = makeinfo --force
@@ -100,11 +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
+
+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