Mercurial > emacs
changeset 110895:b803c876a460
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).
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 09 Oct 2010 23:38:04 +0200 |
| parents | 39eed86814a2 |
| children | 0d6d71f9b91a |
| files | doc/emacs/ChangeLog doc/emacs/makefile.w32-in doc/lispref/ChangeLog doc/lispref/makefile.w32-in doc/misc/ChangeLog doc/misc/makefile.w32-in |
| diffstat | 6 files changed, 33 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/emacs/ChangeLog Sat Oct 09 23:38:04 2010 +0200 @@ -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.
--- a/doc/emacs/makefile.w32-in Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/emacs/makefile.w32-in Sat Oct 09 23:38:04 2010 +0200 @@ -56,6 +56,7 @@ EMACSSOURCES= \ $(srcdir)/emacs.texi \ + $(srcdir)/emacsver.texi \ $(srcdir)/doclicense.texi \ $(srcdir)/screen.texi \ $(srcdir)/commands.texi \
--- a/doc/lispref/ChangeLog Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/lispref/ChangeLog Sat Oct 09 23:38:04 2010 +0200 @@ -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.
--- a/doc/lispref/makefile.w32-in Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/lispref/makefile.w32-in Sat Oct 09 23:38:04 2010 +0200 @@ -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 \
--- a/doc/misc/ChangeLog Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/misc/ChangeLog Sat Oct 09 23:38:04 2010 +0200 @@ -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.
--- a/doc/misc/makefile.w32-in Sat Oct 09 14:19:09 2010 -0700 +++ b/doc/misc/makefile.w32-in Sat Oct 09 23:38:04 2010 +0200 @@ -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