Commit 53ed5e45 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): New variable to control texi2dvi and texi2pdf.
parent a8e1e9ee
2011-01-23 Werner Lemberg <wl@gnu.org>
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable. Use it where appropriate.
(ENVADD): New variable to control texi2dvi and texi2pdf.
2010-11-13 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi: Rename the `count-words-region' example,
......
......@@ -28,11 +28,15 @@ infodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
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) $(MAKEINFO_OPTS)"
mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir}
.PHONY: info dvi html pdf ps
......@@ -48,19 +52,19 @@ ps: emacs-lisp-intro.ps
# -NN extensions to fit into DOS 8+3 limits without clashing.
${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi
$(mkinfodir)
$(MAKEINFO) -o $@ $<
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi
$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $<
$(ENVADD) $(TEXI2DVI) $<
emacs-lisp-intro.ps: emacs-lisp-intro.dvi
$(DVIPS) -o $@ $<
emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi
$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $<
$(ENVADD) $(TEXI2PDF) $<
emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi
$(MAKEINFO) --html -o $@ $<
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
......
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