diff options
| author | Werner LEMBERG <wl@gnu.org> | 2011-01-23 11:38:14 +0100 |
|---|---|---|
| committer | Werner LEMBERG <wl@gnu.org> | 2011-01-23 11:38:14 +0100 |
| commit | 45eb2a5d4609e89fae1723979f26a56b5fba8fa1 (patch) | |
| tree | d647ac56e9faae305adb861b5cbb314d74bff5bb /doc/emacs/Makefile.in | |
| parent | 53ed5e45d394747a9de976a936cd8b017f75e1a4 (diff) | |
| download | emacs-45eb2a5d4609e89fae1723979f26a56b5fba8fa1.tar.gz | |
Improve configuration of makeinfo.
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable. Use it where appropriate.
(ENVADD): Updated.
Diffstat (limited to 'doc/emacs/Makefile.in')
| -rw-r--r-- | doc/emacs/Makefile.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 441a08f3be0..f3dbda1325c 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -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) $< |