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).

6 files changed, 33 insertions, 6 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 079ff94eb59..5d6f2a48aa5 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (EMACSSOURCES): Add emacsver.texi.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (VPATH): Remove.
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 7e2aa36a5f0..213077cbc8f 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -56,6 +56,7 @@ EMACS_XTRA=\
 
 EMACSSOURCES= \
         $(srcdir)/emacs.texi \
+        $(srcdir)/emacsver.texi \
         $(srcdir)/doclicense.texi \
         $(srcdir)/screen.texi \
         $(srcdir)/commands.texi \
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 512e71313d2..ed15a7e1640 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (emacsdir): New variable.
+        (srcs): Add emacsver.texi.
+        ($(infodir)/elisp, elisp.dvi): Add -I$(emacsdir).
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (VPATH): Remove.
diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index 008870b3c5c..86a0de33095 100644
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -25,6 +25,9 @@ srcdir = .
 infodir = $(srcdir)/../../info
 usermanualdir = $(srcdir)/../emacs
 
+# Directory with emacsver.texi.
+emacsdir = $(srcdir)/../emacs
+
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
 TEX=tex
@@ -43,6 +46,7 @@ manual = elisp-manual-23-$(VERSION)
 # List of all the texinfo files in the manual:
 
 srcs = \
+  $(emacsdir)/emacsver.texi \
   $(srcdir)/abbrevs.texi \
   $(srcdir)/advice.texi \
   $(srcdir)/anti.texi \
@@ -107,10 +111,12 @@ $(infodir)/dir:
         $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)
-        $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi
+        $(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
+          -o $(infodir)/elisp $(srcdir)/elisp.texi
 
 elisp.dvi: $(srcs)
-        $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi
+        $(texinputdir) $(TEX) -I $(usermanualdir) -I$(emacsdir) \
+          $(srcdir)/elisp.texi
 
 clean:
         - $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
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