(texinfodir): Rename from usermanualdir, and update.

diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 426f74b2e1c1b82c793d5c71eac3e2fb52adba87..842a9bfc91e6aa0e7897807e797a10658c0cd9cc 100644 (file)
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-09  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (texinfodir): Rename from usermanualdir, and update.
+
 2009-07-06  Glenn Morris  <rgm@gnu.org>
 
        * emacs-lisp-intro.texi (defvar and asterisk): Minor rephrasing.

diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in
index 8299195d1309424a0dbe2397caa0784e268496de..151cf2f4714c7823848f67e89c8e9b5ac4243ef2 100644 (file)
--- a/doc/lispintro/Makefile.in
+++ b/doc/lispintro/Makefile.in
@@ -25,7 +25,8 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 infodir = ../../info
-usermanualdir = $(srcdir)/../emacs
+# 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
@@ -47,7 +48,7 @@ ${infodir}/eintr: ${INFO_SOURCES}
        cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr
 
 emacs-lisp-intro.dvi: ${INFO_SOURCES}
-       $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/emacs-lisp-intro.texi
+       $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $(srcdir)/emacs-lisp-intro.texi
 
 emacs-lisp-intro.html: $(INFO_SOURCES)
        $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi