Fix building manuals on MS-Windows using emacsver.texi.

 misc/makefile.w32-in (emacsdir): New variable.
 ($(infodir)/efaq, faq.dvi): Depend on emacsver.texi.
 (ENVADD, $(infodir)/efaq): Add -I$(emacsdir).
 emacs/makefile.w32-in (EMACSSOURCES): Add emacsver.texi.
 lispref/makefile.w32-in (emacsdir): New variable.
 (srcs): Add emacsver.texi.
 ($(infodir)/elisp, elisp.dvi): Add -I$(emacsdir).

2 files changed, 14 insertions, 4 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 167462ef686..b3c52d5c36a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (emacsdir): New variable.
+        ($(infodir)/efaq, faq.dvi): Depend on emacsver.texi.
+        (ENVADD, $(infodir)/efaq): Add -I$(emacsdir).
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (mostlyclean): Delete *.toc.
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 1c5fec41095..f4887738411 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -27,6 +27,10 @@ srcdir=.
 
 infodir = $(srcdir)/../../info
 
+## Directory with emacsver.texi.
+## Currently only used by efaq; could be added to MAKEINFO.
+emacsdir = $(srcdir)/../emacs
+
 # The makeinfo program is part of the Texinfo distribution.
 MAKEINFO = makeinfo --force
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
@@ -66,7 +70,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-         "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+         "MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(emacsdir)" /C
 
 
 info: $(INFO_TARGETS)
@@ -213,9 +217,9 @@ $(infodir)/widget: widget.texi
 widget.dvi: widget.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
-$(infodir)/efaq: faq.texi
-        $(MAKEINFO) faq.texi
-faq.dvi: faq.texi
+$(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
+        $(MAKEINFO) -I$(emacsdir) faq.texi
+faq.dvi: faq.texi $(emacsdir)/emacsver.texi
         $(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
 $(infodir)/autotype: autotype.texi