Mercurial > emacs
comparison doc/emacs/Makefile.in @ 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 | 61f7601898b1 |
| children |
comparison
equal
deleted
inserted
replaced
| 112443:295000738bf5 | 112444:4302934369fd |
|---|---|
| 37 # Directory with the (customized) texinfo.tex file. | 37 # Directory with the (customized) texinfo.tex file. |
| 38 texinfodir = $(srcdir)/../misc | 38 texinfodir = $(srcdir)/../misc |
| 39 | 39 |
| 40 # The makeinfo program is part of the Texinfo distribution. | 40 # The makeinfo program is part of the Texinfo distribution. |
| 41 # Use --force so that it generates output even if there are errors. | 41 # Use --force so that it generates output even if there are errors. |
| 42 MAKEINFO = makeinfo --force -I $(srcdir) | 42 MAKEINFO = @MAKEINFO@ |
| 43 MAKEINFO_OPTS = --force -I $(srcdir) | |
| 43 | 44 |
| 44 TEXI2DVI = texi2dvi | 45 TEXI2DVI = texi2dvi |
| 45 TEXI2PDF = texi2pdf | 46 TEXI2PDF = texi2pdf |
| 46 DVIPS = dvips | 47 DVIPS = dvips |
| 47 | 48 |
| 48 | 49 |
| 49 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" | 50 ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ |
| 51 MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" | |
| 50 | 52 |
| 51 | 53 |
| 52 EMACS_XTRA= \ | 54 EMACS_XTRA= \ |
| 53 ${srcdir}/emacs-xtra.texi \ | 55 ${srcdir}/emacs-xtra.texi \ |
| 54 $(srcdir)/arevert-xtra.texi \ | 56 $(srcdir)/arevert-xtra.texi \ |
| 127 # There is no provision for Info files to exist in the build directory. | 129 # There is no provision for Info files to exist in the build directory. |
| 128 # In a distribution of Emacs, the Info files should be up to date. | 130 # In a distribution of Emacs, the Info files should be up to date. |
| 129 | 131 |
| 130 $(infodir)/emacs: ${EMACSSOURCES} | 132 $(infodir)/emacs: ${EMACSSOURCES} |
| 131 $(mkinfodir) | 133 $(mkinfodir) |
| 132 $(MAKEINFO) -o $@ $< | 134 $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $< |
| 133 | 135 |
| 134 emacs.dvi: ${EMACSSOURCES} | 136 emacs.dvi: ${EMACSSOURCES} |
| 135 $(ENVADD) $(TEXI2DVI) $< | 137 $(ENVADD) $(TEXI2DVI) $< |
| 136 | 138 |
| 137 emacs.ps: emacs.dvi | 139 emacs.ps: emacs.dvi |
| 139 | 141 |
| 140 emacs.pdf: ${EMACSSOURCES} | 142 emacs.pdf: ${EMACSSOURCES} |
| 141 $(ENVADD) $(TEXI2PDF) $< | 143 $(ENVADD) $(TEXI2PDF) $< |
| 142 | 144 |
| 143 emacs.html: ${EMACSSOURCES} | 145 emacs.html: ${EMACSSOURCES} |
| 144 $(MAKEINFO) --html -o $@ $< | 146 $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $< |
| 145 | 147 |
| 146 emacs-xtra.dvi: $(EMACS_XTRA) | 148 emacs-xtra.dvi: $(EMACS_XTRA) |
| 147 $(ENVADD) $(TEXI2DVI) $< | 149 $(ENVADD) $(TEXI2DVI) $< |
| 148 | 150 |
| 149 emacs-xtra.ps: emacs-xtra.dvi | 151 emacs-xtra.ps: emacs-xtra.dvi |