Mercurial > emacs
changeset 112444:4302934369fd
Improve configuration of makeinfo.
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable. Use it where appropriate.
(ENVADD): Updated.
| author | Werner Lemberg <wl@gnu.org> |
|---|---|
| date | Sun, 23 Jan 2011 11:34:39 +0100 |
| parents | 295000738bf5 |
| children | 93fcbcb698b0 |
| files | doc/emacs/ChangeLog doc/emacs/Makefile.in |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Sun Jan 23 11:31:21 2011 +0100 +++ b/doc/emacs/ChangeLog Sun Jan 23 11:34:39 2011 +0100 @@ -1,3 +1,9 @@ +2011-01-23 Werner Lemberg <wl@gnu.org> + + * Makefile.in (MAKEINFO): Now controlled by `configure'. + (MAKEINFO_OPTS): New variable. Use it where appropriate. + (ENVADD): Updated. + 2011-01-18 Glenn Morris <rgm@gnu.org> * ack.texi, emacs.texi (Acknowledgments): Update for ERT addition.
--- a/doc/emacs/Makefile.in Sun Jan 23 11:31:21 2011 +0100 +++ b/doc/emacs/Makefile.in Sun Jan 23 11:34:39 2011 +0100 @@ -39,14 +39,16 @@ # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. -MAKEINFO = makeinfo --force -I $(srcdir) +MAKEINFO = @MAKEINFO@ +MAKEINFO_OPTS = --force -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" +ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" EMACS_XTRA= \ @@ -129,7 +131,7 @@ $(infodir)/emacs: ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< @@ -141,7 +143,7 @@ $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) --html -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $<