mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-18 18:05:07 +00:00
* Makefile.in (MAKEINFO): Now controlled by `configure'.
(MAKEINFO_OPTS): New variable. Use it where appropriate. (ENVADD): New variable to control texi2dvi and texi2pdf.
This commit is contained in:
parent
200034fcff
commit
a8e1e9ee62
@ -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): New variable to control texi2dvi and texi2pdf.
|
||||
|
||||
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* files.texi (Directory Names): Move directory-abbrev-alist doc to
|
||||
|
@ -32,11 +32,15 @@ texinfodir = $(srcdir)/../misc
|
||||
# Directory with emacsver.texi.
|
||||
emacsdir = $(srcdir)/../emacs
|
||||
|
||||
MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
|
||||
TEXI2DVI = texi2dvi
|
||||
TEXI2PDF = texi2pdf
|
||||
DVIPS = dvips
|
||||
|
||||
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
|
||||
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
|
||||
|
||||
# List of all the texinfo files in the manual:
|
||||
|
||||
srcs = \
|
||||
@ -106,19 +110,19 @@ ps: elisp.ps
|
||||
|
||||
$(infodir)/elisp: $(srcs)
|
||||
$(mkinfodir)
|
||||
$(MAKEINFO) -o $@ $<
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $<
|
||||
|
||||
elisp.dvi: $(srcs)
|
||||
$(TEXI2DVI) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
|
||||
$(ENVADD) $(TEXI2DVI) $<
|
||||
|
||||
elisp.html: $(srcs)
|
||||
$(MAKEINFO) --html -o $@ $<
|
||||
$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $<
|
||||
|
||||
elisp.ps: elisp.dvi
|
||||
$(DVIPS) -o $@ $<
|
||||
|
||||
elisp.pdf: $(srcs)
|
||||
$(TEXI2PDF) -I $(srcdir) -I $(texinfodir) -I $(emacsdir) $<
|
||||
$(ENVADD) $(TEXI2PDF) $<
|
||||
|
||||
.PHONY: mostlyclean clean distclean maintainer-clean infoclean
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user