(usermanualdir): Define.

(emacs-lisp-intro.dvi): Pass -I options to texi2dvi instead of
using TEXINPUTS.

diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index eacd1546918a4f3be22e15774f911b7568b7a87f..cfc9b9b3bfde8bf2bfaa7c5f7b1944a3092cb6e2 100644 (file)
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -26,6 +26,7 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 infodir = ../info
+usermanualdir = $(srcdir)/../man
 
 INFO_SOURCES = ${srcdir}/emacs-lisp-intro.texi
 # The file name eintr must fit within 5 characters, to allow for
@@ -36,7 +37,6 @@ DVI_TARGETS = emacs-lisp-intro.dvi
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 DVIPS = dvips
-ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)"
 
 .SUFFIXES: .dvi .ps .texi
 
@@ -48,7 +48,7 @@ ${infodir}/eintr: ${INFO_SOURCES}
        cd $(srcdir); $(MAKEINFO) emacs-lisp-intro.texi -o $(infodir)/eintr
 
 emacs-lisp-intro.dvi: ${INFO_SOURCES}
-       $(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-lisp-intro.texi
+       $(TEXI2DVI) -I $(srcdir) -I $(usermanualdir) $(srcdir)/emacs-lisp-intro.texi
 
 emacs-lisp-intro.html: $(INFO_SOURCES)
        $(MAKEINFO) --html -o $@ $(srcdir)/emacs-lisp-intro.texi