[Emacs-diffs] /srv/bzr/emacs/trunk r101889: Fix building manuals on MS-Windows using emacsver.texi.

[Eli Zaretskii]

------------------------------------------------------------
revno: 101889
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-09 23:38:04 +0200
message:
  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).
modified:
  doc/emacs/ChangeLog
  doc/emacs/makefile.w32-in
  doc/lispref/ChangeLog
  doc/lispref/makefile.w32-in
  doc/misc/ChangeLog
  doc/misc/makefile.w32-in

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-10-09 21:19:09 +0000
+++ b/doc/emacs/ChangeLog       2010-10-09 21:38:04 +0000
@@ -1,3 +1,7 @@
+2010-10-09  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in (EMACSSOURCES): Add emacsver.texi.
+
 2010-10-09  Glenn Morris  <address@hidden>
 
        * Makefile.in (VPATH): Remove.

=== modified file 'doc/emacs/makefile.w32-in'
--- a/doc/emacs/makefile.w32-in 2010-01-13 08:35:10 +0000
+++ b/doc/emacs/makefile.w32-in 2010-10-09 21:38:04 +0000
@@ -56,6 +56,7 @@
 
 EMACSSOURCES= \
        $(srcdir)/emacs.texi \
+       $(srcdir)/emacsver.texi \
        $(srcdir)/doclicense.texi \
        $(srcdir)/screen.texi \
        $(srcdir)/commands.texi \

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-10-09 21:19:09 +0000
+++ b/doc/lispref/ChangeLog     2010-10-09 21:38:04 +0000
@@ -1,3 +1,9 @@
+2010-10-09  Eli Zaretskii  <address@hidden>
+
+       * makefile.w32-in (emacsdir): New variable.
+       (srcs): Add emacsver.texi.
+       ($(infodir)/elisp, elisp.dvi): Add -I$(emacsdir).
+
 2010-10-09  Glenn Morris  <address@hidden>
 
        * Makefile.in (VPATH): Remove.

=== modified file 'doc/lispref/makefile.w32-in'
--- a/doc/lispref/makefile.w32-in       2010-01-13 08:35:10 +0000
+++ b/doc/lispref/makefile.w32-in       2010-10-09 21:38:04 +0000
@@ -25,6 +25,9 @@
 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 @@
 # 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 @@
        $(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 \

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-09 20:14:43 +0000
+++ b/doc/misc/ChangeLog        2010-10-09 21:38:04 +0000
@@ -1,3 +1,9 @@
+2010-10-09  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (mostlyclean): Delete *.toc.

=== modified file 'doc/misc/makefile.w32-in'
--- a/doc/misc/makefile.w32-in  2010-01-13 08:35:10 +0000
+++ b/doc/misc/makefile.w32-in  2010-10-09 21:38:04 +0000
@@ -27,6 +27,10 @@
 
 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 @@
 
 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 @@
 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