Commit 45eb2a5d authored by Werner LEMBERG's avatar Werner LEMBERG

Improve configuration of makeinfo.

* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable.  Use it where appropriate.
(ENVADD): Updated.
parent 53ed5e45
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.
......
......@@ -39,14 +39,16 @@ texinfodir = $(srcdir)/../misc
# 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 @@ ps: emacs.ps
$(infodir)/emacs: ${EMACSSOURCES}
$(mkinfodir)
$(MAKEINFO) -o $@ $<
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
emacs.dvi: ${EMACSSOURCES}
$(ENVADD) $(TEXI2DVI) $<
......@@ -141,7 +143,7 @@ emacs.pdf: ${EMACSSOURCES}
$(ENVADD) $(TEXI2PDF) $<
emacs.html: ${EMACSSOURCES}
$(MAKEINFO) --html -o $@ $<
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
emacs-xtra.dvi: $(EMACS_XTRA)
$(ENVADD) $(TEXI2DVI) $<
......
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>
* ert.texi: Relicense under GFDL 1.3+, and standardize license notice.
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment