* MAKEINFO variable not honoured
@ 2011-01-01 12:21 Werner LEMBERG
2011-01-03 5:23 ` Werner LEMBERG
2011-01-03 8:22 ` Andreas Schwab
0 siblings, 2 replies; 15+ messages in thread
From: Werner LEMBERG @ 2011-01-01 12:21 UTC (permalink / raw)
To: emacs-devel
[revno 102734]
For testing purposes, I have installed the current development
version of makeinfo in /usr/local/bin. Since this isn't ready yet for
production purposes (it's unbearably slow), I configured emacs with
MAKEINFO=/usr/bin/makeinfo ./configure
However, during `make bootstrap', this variable isn't honoured since
the sub-Makefiles in the `doc' subdirectory contain lines like this
MAKEINFO = makeinfo --force -I $(srcdir)
which directly overwrite the MAKEINFO variable.
Below a trivial patch which fixes this.
Werner
======================================================================
--- ./doc/lispref/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100
+++ ./doc/lispref/Makefile.in 2011-01-01 13:18:04.000000000 +0100
@@ -32,7 +32,7 @@
# Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
-MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir)
+MAKEINFO = @MAKEINFO@ --force -I $(emacsdir) -I $(srcdir)
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
DVIPS = dvips
--- ./doc/lispintro/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100
+++ ./doc/lispintro/Makefile.in 2011-01-01 13:17:47.000000000 +0100
@@ -28,7 +28,7 @@
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
-MAKEINFO = makeinfo --force -I $(srcdir)
+MAKEINFO = @MAKEINFO@ --force -I $(srcdir)
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
DVIPS = dvips
--- ./doc/emacs/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100
+++ ./doc/emacs/Makefile.in 2011-01-01 13:17:15.000000000 +0100
@@ -39,7 +39,7 @@
# 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@ --force -I $(srcdir)
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
--- ./doc/misc/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100
+++ ./doc/misc/Makefile.in 2011-01-01 13:18:23.000000000 +0100
@@ -42,7 +42,7 @@
# 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$(emacsdir)
+MAKEINFO = @MAKEINFO@ --force -I$(emacsdir)
# Also add new entries to INFO_FILES in the top-level Makefile.in.
INFO_TARGETS = \
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: MAKEINFO variable not honoured 2011-01-01 12:21 MAKEINFO variable not honoured Werner LEMBERG @ 2011-01-03 5:23 ` Werner LEMBERG 2011-01-03 5:50 ` Glenn Morris 2011-01-03 8:22 ` Andreas Schwab 1 sibling, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-03 5:23 UTC (permalink / raw) To: emacs-devel > However, during `make bootstrap', this variable isn't honoured since > the sub-Makefiles in the `doc' subdirectory contain lines like this > > MAKEINFO = makeinfo --force -I $(srcdir) > > which directly overwrite the MAKEINFO variable. > > Below a trivial patch which fixes this. Thanks for your enthusiastical silence! :-) If noone objects, I'll apply it. Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 5:23 ` Werner LEMBERG @ 2011-01-03 5:50 ` Glenn Morris 2011-01-03 6:20 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Glenn Morris @ 2011-01-03 5:50 UTC (permalink / raw) To: Werner LEMBERG; +Cc: emacs-devel Werner LEMBERG wrote: >> However, during `make bootstrap', this variable isn't honoured since >> the sub-Makefiles in the `doc' subdirectory contain lines like this >> >> MAKEINFO = makeinfo --force -I $(srcdir) >> >> which directly overwrite the MAKEINFO variable. >> >> Below a trivial patch which fixes this. > > Thanks for your enthusiastical silence! :-) If noone objects, I'll > apply it. A little over a day is not a long time to wait for replies. It will give funny results when MAKEINFO = off or no. Probably those cases ought to be reworked somehow. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 5:50 ` Glenn Morris @ 2011-01-03 6:20 ` Werner LEMBERG 0 siblings, 0 replies; 15+ messages in thread From: Werner LEMBERG @ 2011-01-03 6:20 UTC (permalink / raw) To: rgm; +Cc: emacs-devel > It will give funny results when MAKEINFO = off or no. > Probably those cases ought to be reworked somehow. Well, if MAKEINFO is `no', the old rules would fail similarly since no binary is available at all and `makeinfo' gets called explicitly. And for `off', the rules are never executed since the top-level target is different. However, we could indeed do some cosmetics to use, say, `:' as the expansion of @MAKEINFO@ for those two cases but I wonder whether this is really needed. Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-01 12:21 MAKEINFO variable not honoured Werner LEMBERG 2011-01-03 5:23 ` Werner LEMBERG @ 2011-01-03 8:22 ` Andreas Schwab 2011-01-03 8:36 ` Werner LEMBERG 1 sibling, 1 reply; 15+ messages in thread From: Andreas Schwab @ 2011-01-03 8:22 UTC (permalink / raw) To: Werner LEMBERG; +Cc: emacs-devel Werner LEMBERG <wl@gnu.org> writes: > --- ./doc/lispref/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100 > +++ ./doc/lispref/Makefile.in 2011-01-01 13:18:04.000000000 +0100 > @@ -32,7 +32,7 @@ > # Directory with emacsver.texi. > emacsdir = $(srcdir)/../emacs > > -MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) > +MAKEINFO = @MAKEINFO@ --force -I $(emacsdir) -I $(srcdir) The line should read "MAKEINFO = @MAKEINFO@" exactly, with the extra options being put in a different variable. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 8:22 ` Andreas Schwab @ 2011-01-03 8:36 ` Werner LEMBERG 2011-01-03 8:50 ` Andreas Schwab 0 siblings, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-03 8:36 UTC (permalink / raw) To: schwab; +Cc: emacs-devel >> -MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) >> +MAKEINFO = @MAKEINFO@ --force -I $(emacsdir) -I $(srcdir) > > The line should read "MAKEINFO = @MAKEINFO@" exactly, with the extra > options being put in a different variable. Originally, I've done this, and I can change this easily. Is there a rationale behind this limitation? Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 8:36 ` Werner LEMBERG @ 2011-01-03 8:50 ` Andreas Schwab 2011-01-03 18:23 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Andreas Schwab @ 2011-01-03 8:50 UTC (permalink / raw) To: Werner LEMBERG; +Cc: emacs-devel Werner LEMBERG <wl@gnu.org> writes: >>> -MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) >>> +MAKEINFO = @MAKEINFO@ --force -I $(emacsdir) -I $(srcdir) >> >> The line should read "MAKEINFO = @MAKEINFO@" exactly, with the extra >> options being put in a different variable. > > Originally, I've done this, and I can change this easily. Is there a > rationale behind this limitation? It's not a limitation. It makes it possible to properly override it without reconfiguring. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 8:50 ` Andreas Schwab @ 2011-01-03 18:23 ` Werner LEMBERG 2011-01-21 18:36 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-03 18:23 UTC (permalink / raw) To: schwab; +Cc: emacs-devel > It's not a limitation. It makes it possible to properly override it > without reconfiguring. OK. Here's what I now have. The patch is now much larger but still trivial IMHO. Werner ====================================================================== --- ./doc/lispref/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100 +++ ./doc/lispref/Makefile.in 2011-01-03 10:13:11.000000000 +0100 @@ -32,11 +32,15 @@ # 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 @@ $(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 --- ./doc/lispintro/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100 +++ ./doc/lispintro/Makefile.in 2011-01-03 10:12:07.000000000 +0100 @@ -28,11 +28,15 @@ # 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 @@ # -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 --- ./doc/emacs/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100 +++ ./doc/emacs/Makefile.in 2011-01-03 10:11:48.000000000 +0100 @@ -39,14 +39,16 @@ # 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 @@ $(infodir)/emacs: ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< @@ -141,7 +143,7 @@ $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) --html -o $@ $< + $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< --- ./doc/misc/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100 +++ ./doc/misc/Makefile.in 2011-01-03 10:15:09.000000000 +0100 @@ -42,7 +42,8 @@ # 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$(emacsdir) +MAKEINFO = @MAKEINFO@ +MAKEINFO_OPTS = --force -I$(emacsdir) # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ @@ -198,7 +199,8 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf -ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" +ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} @@ -219,7 +221,7 @@ ada-mode : $(infodir)/ada-mode $(infodir)/ada-mode: ada-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< ada-mode.dvi: ${srcdir}/ada-mode.texi $(ENVADD) $(TEXI2DVI) $< ada-mode.pdf: ${srcdir}/ada-mode.texi @@ -228,7 +230,7 @@ auth : $(infodir)/auth $(infodir)/auth: auth.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< auth.dvi: ${srcdir}/auth.texi $(ENVADD) $(TEXI2DVI) $< auth.pdf: ${srcdir}/auth.texi @@ -237,7 +239,7 @@ autotype : $(infodir)/autotype $(infodir)/autotype: autotype.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< autotype.dvi: ${srcdir}/autotype.texi $(ENVADD) $(TEXI2DVI) $< autotype.pdf: ${srcdir}/autotype.texi @@ -246,7 +248,7 @@ calc : $(infodir)/calc $(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $< calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi @@ -255,7 +257,7 @@ ccmode : $(infodir)/ccmode $(infodir)/ccmode: cc-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< cc-mode.dvi: ${srcdir}/cc-mode.texi $(ENVADD) $(TEXI2DVI) $< cc-mode.pdf: ${srcdir}/cc-mode.texi @@ -264,7 +266,7 @@ cl : $(infodir)/cl $(infodir)/cl: cl.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< cl.dvi: ${srcdir}/cl.texi $(ENVADD) $(TEXI2DVI) $< cl.pdf: ${srcdir}/cl.texi @@ -273,7 +275,7 @@ dbus : $(infodir)/dbus $(infodir)/dbus: dbus.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< dbus.dvi: ${srcdir}/dbus.texi $(ENVADD) $(TEXI2DVI) $< dbus.pdf: ${srcdir}/dbus.texi @@ -282,7 +284,7 @@ dired-x : $(infodir)/dired-x $(infodir)/dired-x: dired-x.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< dired-x.dvi: ${srcdir}/dired-x.texi $(ENVADD) $(TEXI2DVI) $< dired-x.pdf: ${srcdir}/dired-x.texi @@ -291,7 +293,7 @@ ebrowse : $(infodir)/ebrowse $(infodir)/ebrowse: ebrowse.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< ebrowse.dvi: ${srcdir}/ebrowse.texi $(ENVADD) $(TEXI2DVI) $< ebrowse.pdf: ${srcdir}/ebrowse.texi @@ -300,7 +302,7 @@ ede : $(infodir)/ede $(infodir)/ede: ede.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< ede.dvi: ${srcdir}/ede.texi $(ENVADD) $(TEXI2DVI) $< ede.pdf: ${srcdir}/ede.texi @@ -309,7 +311,7 @@ ediff : $(infodir)/ediff $(infodir)/ediff: ediff.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< ediff.dvi: ${srcdir}/ediff.texi $(ENVADD) $(TEXI2DVI) $< ediff.pdf: ${srcdir}/ediff.texi @@ -318,7 +320,7 @@ edt : $(infodir)/edt $(infodir)/edt: edt.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< edt.dvi: ${srcdir}/edt.texi $(ENVADD) $(TEXI2DVI) $< edt.pdf: ${srcdir}/edt.texi @@ -327,7 +329,7 @@ eieio : $(infodir)/eieio $(infodir)/eieio: eieio.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< eieio.dvi: ${srcdir}/eieio.texi $(ENVADD) $(TEXI2DVI) $< eieio.pdf: ${srcdir}/eieio.texi @@ -336,7 +338,7 @@ emacs-mime : $(infodir)/emacs-mime $(infodir)/emacs-mime: emacs-mime.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) --enable-encoding $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding $< emacs-mime.dvi: ${srcdir}/emacs-mime.texi $(ENVADD) $(TEXI2DVI) $< emacs-mime.pdf: ${srcdir}/emacs-mime.texi @@ -345,7 +347,7 @@ epa : $(infodir)/epa $(infodir)/epa: epa.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< epa.dvi: ${srcdir}/epa.texi $(ENVADD) $(TEXI2DVI) $< epa.pdf: ${srcdir}/epa.texi @@ -354,7 +356,7 @@ erc : $(infodir)/erc $(infodir)/erc: erc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< erc.dvi: ${srcdir}/erc.texi $(ENVADD) $(TEXI2DVI) $< erc.pdf: ${srcdir}/erc.texi @@ -363,7 +365,7 @@ eshell : $(infodir)/eshell $(infodir)/eshell: eshell.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< eshell.dvi: ${srcdir}/eshell.texi $(ENVADD) $(TEXI2DVI) $< eshell.pdf: ${srcdir}/eshell.texi @@ -372,7 +374,7 @@ eudc : $(infodir)/eudc $(infodir)/eudc: eudc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< eudc.dvi: ${srcdir}/eudc.texi $(ENVADD) $(TEXI2DVI) $< eudc.pdf: ${srcdir}/eudc.texi @@ -381,7 +383,7 @@ efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi $(ENVADD) $(TEXI2DVI) $< faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi @@ -390,7 +392,7 @@ flymake : $(infodir)/flymake $(infodir)/flymake: flymake.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< flymake.dvi: ${srcdir}/flymake.texi $(ENVADD) $(TEXI2DVI) $< flymake.pdf: ${srcdir}/flymake.texi @@ -399,7 +401,7 @@ forms : $(infodir)/forms $(infodir)/forms: forms.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< forms.dvi: ${srcdir}/forms.texi $(ENVADD) $(TEXI2DVI) $< forms.pdf: ${srcdir}/forms.texi @@ -409,7 +411,7 @@ gnus : $(infodir)/gnus $(infodir)/gnus: gnus.texi gnus-faq.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi $(ENVADD) $(TEXI2DVI) gnustmp.texi @@ -426,7 +428,7 @@ idlwave : $(infodir)/idlwave $(infodir)/idlwave: idlwave.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) --no-split $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $< idlwave.dvi: ${srcdir}/idlwave.texi $(ENVADD) $(TEXI2DVI) $< idlwave.pdf: ${srcdir}/idlwave.texi @@ -438,7 +440,7 @@ ###info : $(infodir)/info # circular! $(infodir)/info: info.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) --no-split $< -o $@ + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $< -o $@ info.dvi: ${srcdir}/info.texi $(ENVADD) $(TEXI2DVI) $< info.pdf: ${srcdir}/info.texi @@ -447,7 +449,7 @@ mairix-el : $(infodir)/mairix-el $(infodir)/mairix-el: mairix-el.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< mairix-el.dvi: ${srcdir}/mairix-el.texi $(ENVADD) $(TEXI2DVI) $< mairix-el.pdf: ${srcdir}/mairix-el.texi @@ -456,7 +458,7 @@ message : $(infodir)/message $(infodir)/message: message.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< message.dvi: ${srcdir}/message.texi $(ENVADD) $(TEXI2DVI) $< message.pdf: ${srcdir}/message.texi @@ -465,7 +467,7 @@ mh-e : $(infodir)/mh-e $(infodir)/mh-e: mh-e.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< mh-e.dvi: ${srcdir}/mh-e.texi $(ENVADD) $(TEXI2DVI) $< mh-e.pdf: ${srcdir}/mh-e.texi @@ -474,7 +476,7 @@ newsticker : $(infodir)/newsticker $(infodir)/newsticker: newsticker.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< newsticker.dvi: ${srcdir}/newsticker.texi $(ENVADD) $(TEXI2DVI) $< newsticker.pdf: ${srcdir}/newsticker.texi @@ -483,7 +485,7 @@ nxml-mode : $(infodir)/nxml-mode $(infodir)/nxml-mode: nxml-mode.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< nxml-mode.dvi: ${srcdir}/nxml-mode.texi $(ENVADD) $(TEXI2DVI) $< nxml-mode.pdf: ${srcdir}/nxml-mode.texi @@ -492,7 +494,7 @@ org : $(infodir)/org $(infodir)/org: org.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< org.dvi: ${srcdir}/org.texi $(ENVADD) $(TEXI2DVI) $< org.pdf: ${srcdir}/org.texi @@ -501,7 +503,7 @@ pcl-cvs : $(infodir)/pcl-cvs $(infodir)/pcl-cvs: pcl-cvs.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi $(ENVADD) $(TEXI2DVI) $< pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi @@ -510,7 +512,7 @@ pgg : $(infodir)/pgg $(infodir)/pgg: pgg.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< pgg.dvi: ${srcdir}/pgg.texi $(ENVADD) $(TEXI2DVI) $< pgg.pdf: ${srcdir}/pgg.texi @@ -519,7 +521,7 @@ rcirc : $(infodir)/rcirc $(infodir)/rcirc: rcirc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< rcirc.dvi: ${srcdir}/rcirc.texi $(ENVADD) $(TEXI2DVI) $< rcirc.pdf: ${srcdir}/rcirc.texi @@ -528,7 +530,7 @@ reftex : $(infodir)/reftex $(infodir)/reftex: reftex.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< reftex.dvi: ${srcdir}/reftex.texi $(ENVADD) $(TEXI2DVI) $< reftex.pdf: ${srcdir}/reftex.texi @@ -537,7 +539,7 @@ remember : $(infodir)/remember $(infodir)/remember: remember.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< remember.dvi: ${srcdir}/remember.texi $(ENVADD) $(TEXI2DVI) $< remember.pdf: ${srcdir}/remember.texi @@ -546,7 +548,7 @@ sasl : $(infodir)/sasl $(infodir)/sasl: sasl.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< sasl.dvi: ${srcdir}/sasl.texi $(ENVADD) $(TEXI2DVI) $< sasl.pdf: ${srcdir}/sasl.texi @@ -555,7 +557,7 @@ sc : $(infodir)/sc $(infodir)/sc: sc.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< sc.dvi: ${srcdir}/sc.texi $(ENVADD) $(TEXI2DVI) $< sc.pdf: ${srcdir}/sc.texi @@ -564,7 +566,7 @@ semantic : $(infodir)/semantic $(infodir)/semantic: semantic.texi sem-user.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< semantic.dvi: ${srcdir}/semantic.texi sem-user.texi $(ENVADD) $(TEXI2DVI) $< semantic.pdf: ${srcdir}/semantic.texi sem-user.texi @@ -573,7 +575,7 @@ ses : $(infodir)/ses $(infodir)/ses: ses.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< ses.dvi: ${srcdir}/ses.texi $(ENVADD) $(TEXI2DVI) $< ses.pdf: ${srcdir}/ses.texi @@ -582,7 +584,7 @@ sieve : $(infodir)/sieve $(infodir)/sieve: sieve.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< sieve.dvi: ${srcdir}/sieve.texi $(ENVADD) $(TEXI2DVI) $< sieve.pdf: ${srcdir}/sieve.texi @@ -591,7 +593,7 @@ smtpmail : $(infodir)/smtpmail $(infodir)/smtpmail: smtpmail.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< smtpmail.dvi: ${srcdir}/smtpmail.texi $(ENVADD) $(TEXI2DVI) $< smtpmail.pdf: ${srcdir}/smtpmail.texi @@ -600,7 +602,7 @@ speedbar : $(infodir)/speedbar $(infodir)/speedbar: speedbar.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< speedbar.dvi: ${srcdir}/speedbar.texi $(ENVADD) $(TEXI2DVI) $< speedbar.pdf: ${srcdir}/speedbar.texi @@ -609,7 +611,7 @@ tramp : $(infodir)/tramp $(infodir)/tramp: tramp.texi trampver.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) -D emacs $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs $< tramp.dvi: ${srcdir}/tramp.texi trampver.texi $(ENVADD) $(TEXI2DVI) $< tramp.pdf: ${srcdir}/tramp.texi trampver.texi @@ -618,7 +620,7 @@ url : $(infodir)/url $(infodir)/url: url.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< url.dvi: ${srcdir}/url.texi $(ENVADD) $(TEXI2DVI) $< url.pdf: ${srcdir}/url.texi @@ -627,7 +629,7 @@ vip : $(infodir)/vip $(infodir)/vip: vip.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< vip.dvi: ${srcdir}/vip.texi $(ENVADD) $(TEXI2DVI) $< vip.pdf: ${srcdir}/vip.texi @@ -636,7 +638,7 @@ viper : $(infodir)/viper $(infodir)/viper: viper.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< viper.dvi: ${srcdir}/viper.texi $(ENVADD) $(TEXI2DVI) $< viper.pdf: ${srcdir}/viper.texi @@ -645,7 +647,7 @@ widget : $(infodir)/widget $(infodir)/widget: widget.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< widget.dvi: ${srcdir}/widget.texi $(ENVADD) $(TEXI2DVI) $< widget.pdf: ${srcdir}/widget.texi @@ -654,7 +656,7 @@ woman : $(infodir)/woman $(infodir)/woman: woman.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $< + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< woman.dvi: ${srcdir}/woman.texi $(ENVADD) $(TEXI2DVI) $< woman.pdf: ${srcdir}/woman.texi ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-03 18:23 ` Werner LEMBERG @ 2011-01-21 18:36 ` Werner LEMBERG 2011-01-22 16:00 ` Chong Yidong 0 siblings, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-21 18:36 UTC (permalink / raw) To: schwab; +Cc: emacs-devel >> It's not a limitation. It makes it possible to properly override it >> without reconfiguring. > > OK. Here's what I now have. The patch is now much larger but still > trivial IMHO. Ping! OK to apply? Werner ====================================================================== > --- ./doc/lispref/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100 > +++ ./doc/lispref/Makefile.in 2011-01-03 10:13:11.000000000 +0100 > @@ -32,11 +32,15 @@ > # 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 @@ > > $(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 > > --- ./doc/lispintro/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100 > +++ ./doc/lispintro/Makefile.in 2011-01-03 10:12:07.000000000 +0100 > @@ -28,11 +28,15 @@ > # 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 @@ > # -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 > > --- ./doc/emacs/Makefile.in.old 2011-01-01 12:51:51.000000000 +0100 > +++ ./doc/emacs/Makefile.in 2011-01-03 10:11:48.000000000 +0100 > @@ -39,14 +39,16 @@ > > # 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 @@ > > $(infodir)/emacs: ${EMACSSOURCES} > $(mkinfodir) > - $(MAKEINFO) -o $@ $< > + $(MAKEINFO) $(MAKEINFO_OPTS) -o $@ $< > > emacs.dvi: ${EMACSSOURCES} > $(ENVADD) $(TEXI2DVI) $< > @@ -141,7 +143,7 @@ > $(ENVADD) $(TEXI2PDF) $< > > emacs.html: ${EMACSSOURCES} > - $(MAKEINFO) --html -o $@ $< > + $(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ $< > > emacs-xtra.dvi: $(EMACS_XTRA) > $(ENVADD) $(TEXI2DVI) $< > --- ./doc/misc/Makefile.in.old 2011-01-01 12:51:56.000000000 +0100 > +++ ./doc/misc/Makefile.in 2011-01-03 10:15:09.000000000 +0100 > @@ -42,7 +42,8 @@ > > # 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$(emacsdir) > +MAKEINFO = @MAKEINFO@ > +MAKEINFO_OPTS = --force -I$(emacsdir) > > # Also add new entries to INFO_FILES in the top-level Makefile.in. > INFO_TARGETS = \ > @@ -198,7 +199,8 @@ > TEXI2DVI = texi2dvi > TEXI2PDF = texi2pdf > > -ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" > +ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ > + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" > > mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} > > @@ -219,7 +221,7 @@ > ada-mode : $(infodir)/ada-mode > $(infodir)/ada-mode: ada-mode.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > ada-mode.dvi: ${srcdir}/ada-mode.texi > $(ENVADD) $(TEXI2DVI) $< > ada-mode.pdf: ${srcdir}/ada-mode.texi > @@ -228,7 +230,7 @@ > auth : $(infodir)/auth > $(infodir)/auth: auth.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > auth.dvi: ${srcdir}/auth.texi > $(ENVADD) $(TEXI2DVI) $< > auth.pdf: ${srcdir}/auth.texi > @@ -237,7 +239,7 @@ > autotype : $(infodir)/autotype > $(infodir)/autotype: autotype.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > autotype.dvi: ${srcdir}/autotype.texi > $(ENVADD) $(TEXI2DVI) $< > autotype.pdf: ${srcdir}/autotype.texi > @@ -246,7 +248,7 @@ > calc : $(infodir)/calc > $(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > calc.dvi: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi > $(ENVADD) $(TEXI2DVI) $< > calc.pdf: ${srcdir}/calc.texi $(emacsdir)/emacsver.texi > @@ -255,7 +257,7 @@ > ccmode : $(infodir)/ccmode > $(infodir)/ccmode: cc-mode.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > cc-mode.dvi: ${srcdir}/cc-mode.texi > $(ENVADD) $(TEXI2DVI) $< > cc-mode.pdf: ${srcdir}/cc-mode.texi > @@ -264,7 +266,7 @@ > cl : $(infodir)/cl > $(infodir)/cl: cl.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > cl.dvi: ${srcdir}/cl.texi > $(ENVADD) $(TEXI2DVI) $< > cl.pdf: ${srcdir}/cl.texi > @@ -273,7 +275,7 @@ > dbus : $(infodir)/dbus > $(infodir)/dbus: dbus.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > dbus.dvi: ${srcdir}/dbus.texi > $(ENVADD) $(TEXI2DVI) $< > dbus.pdf: ${srcdir}/dbus.texi > @@ -282,7 +284,7 @@ > dired-x : $(infodir)/dired-x > $(infodir)/dired-x: dired-x.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > dired-x.dvi: ${srcdir}/dired-x.texi > $(ENVADD) $(TEXI2DVI) $< > dired-x.pdf: ${srcdir}/dired-x.texi > @@ -291,7 +293,7 @@ > ebrowse : $(infodir)/ebrowse > $(infodir)/ebrowse: ebrowse.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > ebrowse.dvi: ${srcdir}/ebrowse.texi > $(ENVADD) $(TEXI2DVI) $< > ebrowse.pdf: ${srcdir}/ebrowse.texi > @@ -300,7 +302,7 @@ > ede : $(infodir)/ede > $(infodir)/ede: ede.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > ede.dvi: ${srcdir}/ede.texi > $(ENVADD) $(TEXI2DVI) $< > ede.pdf: ${srcdir}/ede.texi > @@ -309,7 +311,7 @@ > ediff : $(infodir)/ediff > $(infodir)/ediff: ediff.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > ediff.dvi: ${srcdir}/ediff.texi > $(ENVADD) $(TEXI2DVI) $< > ediff.pdf: ${srcdir}/ediff.texi > @@ -318,7 +320,7 @@ > edt : $(infodir)/edt > $(infodir)/edt: edt.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > edt.dvi: ${srcdir}/edt.texi > $(ENVADD) $(TEXI2DVI) $< > edt.pdf: ${srcdir}/edt.texi > @@ -327,7 +329,7 @@ > eieio : $(infodir)/eieio > $(infodir)/eieio: eieio.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > eieio.dvi: ${srcdir}/eieio.texi > $(ENVADD) $(TEXI2DVI) $< > eieio.pdf: ${srcdir}/eieio.texi > @@ -336,7 +338,7 @@ > emacs-mime : $(infodir)/emacs-mime > $(infodir)/emacs-mime: emacs-mime.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) --enable-encoding $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding $< > emacs-mime.dvi: ${srcdir}/emacs-mime.texi > $(ENVADD) $(TEXI2DVI) $< > emacs-mime.pdf: ${srcdir}/emacs-mime.texi > @@ -345,7 +347,7 @@ > epa : $(infodir)/epa > $(infodir)/epa: epa.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > epa.dvi: ${srcdir}/epa.texi > $(ENVADD) $(TEXI2DVI) $< > epa.pdf: ${srcdir}/epa.texi > @@ -354,7 +356,7 @@ > erc : $(infodir)/erc > $(infodir)/erc: erc.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > erc.dvi: ${srcdir}/erc.texi > $(ENVADD) $(TEXI2DVI) $< > erc.pdf: ${srcdir}/erc.texi > @@ -363,7 +365,7 @@ > eshell : $(infodir)/eshell > $(infodir)/eshell: eshell.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > eshell.dvi: ${srcdir}/eshell.texi > $(ENVADD) $(TEXI2DVI) $< > eshell.pdf: ${srcdir}/eshell.texi > @@ -372,7 +374,7 @@ > eudc : $(infodir)/eudc > $(infodir)/eudc: eudc.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > eudc.dvi: ${srcdir}/eudc.texi > $(ENVADD) $(TEXI2DVI) $< > eudc.pdf: ${srcdir}/eudc.texi > @@ -381,7 +383,7 @@ > efaq : $(infodir)/efaq > $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > faq.dvi: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi > $(ENVADD) $(TEXI2DVI) $< > faq.pdf: ${srcdir}/faq.texi $(emacsdir)/emacsver.texi > @@ -390,7 +392,7 @@ > flymake : $(infodir)/flymake > $(infodir)/flymake: flymake.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > flymake.dvi: ${srcdir}/flymake.texi > $(ENVADD) $(TEXI2DVI) $< > flymake.pdf: ${srcdir}/flymake.texi > @@ -399,7 +401,7 @@ > forms : $(infodir)/forms > $(infodir)/forms: forms.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > forms.dvi: ${srcdir}/forms.texi > $(ENVADD) $(TEXI2DVI) $< > forms.pdf: ${srcdir}/forms.texi > @@ -409,7 +411,7 @@ > gnus : $(infodir)/gnus > $(infodir)/gnus: gnus.texi gnus-faq.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi > sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi > $(ENVADD) $(TEXI2DVI) gnustmp.texi > @@ -426,7 +428,7 @@ > idlwave : $(infodir)/idlwave > $(infodir)/idlwave: idlwave.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) --no-split $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $< > idlwave.dvi: ${srcdir}/idlwave.texi > $(ENVADD) $(TEXI2DVI) $< > idlwave.pdf: ${srcdir}/idlwave.texi > @@ -438,7 +440,7 @@ > ###info : $(infodir)/info # circular! > $(infodir)/info: info.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) --no-split $< -o $@ > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) --no-split $< -o $@ > info.dvi: ${srcdir}/info.texi > $(ENVADD) $(TEXI2DVI) $< > info.pdf: ${srcdir}/info.texi > @@ -447,7 +449,7 @@ > mairix-el : $(infodir)/mairix-el > $(infodir)/mairix-el: mairix-el.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > mairix-el.dvi: ${srcdir}/mairix-el.texi > $(ENVADD) $(TEXI2DVI) $< > mairix-el.pdf: ${srcdir}/mairix-el.texi > @@ -456,7 +458,7 @@ > message : $(infodir)/message > $(infodir)/message: message.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > message.dvi: ${srcdir}/message.texi > $(ENVADD) $(TEXI2DVI) $< > message.pdf: ${srcdir}/message.texi > @@ -465,7 +467,7 @@ > mh-e : $(infodir)/mh-e > $(infodir)/mh-e: mh-e.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > mh-e.dvi: ${srcdir}/mh-e.texi > $(ENVADD) $(TEXI2DVI) $< > mh-e.pdf: ${srcdir}/mh-e.texi > @@ -474,7 +476,7 @@ > newsticker : $(infodir)/newsticker > $(infodir)/newsticker: newsticker.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > newsticker.dvi: ${srcdir}/newsticker.texi > $(ENVADD) $(TEXI2DVI) $< > newsticker.pdf: ${srcdir}/newsticker.texi > @@ -483,7 +485,7 @@ > nxml-mode : $(infodir)/nxml-mode > $(infodir)/nxml-mode: nxml-mode.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > nxml-mode.dvi: ${srcdir}/nxml-mode.texi > $(ENVADD) $(TEXI2DVI) $< > nxml-mode.pdf: ${srcdir}/nxml-mode.texi > @@ -492,7 +494,7 @@ > org : $(infodir)/org > $(infodir)/org: org.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > org.dvi: ${srcdir}/org.texi > $(ENVADD) $(TEXI2DVI) $< > org.pdf: ${srcdir}/org.texi > @@ -501,7 +503,7 @@ > pcl-cvs : $(infodir)/pcl-cvs > $(infodir)/pcl-cvs: pcl-cvs.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > pcl-cvs.dvi: ${srcdir}/pcl-cvs.texi > $(ENVADD) $(TEXI2DVI) $< > pcl-cvs.pdf: ${srcdir}/pcl-cvs.texi > @@ -510,7 +512,7 @@ > pgg : $(infodir)/pgg > $(infodir)/pgg: pgg.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > pgg.dvi: ${srcdir}/pgg.texi > $(ENVADD) $(TEXI2DVI) $< > pgg.pdf: ${srcdir}/pgg.texi > @@ -519,7 +521,7 @@ > rcirc : $(infodir)/rcirc > $(infodir)/rcirc: rcirc.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > rcirc.dvi: ${srcdir}/rcirc.texi > $(ENVADD) $(TEXI2DVI) $< > rcirc.pdf: ${srcdir}/rcirc.texi > @@ -528,7 +530,7 @@ > reftex : $(infodir)/reftex > $(infodir)/reftex: reftex.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > reftex.dvi: ${srcdir}/reftex.texi > $(ENVADD) $(TEXI2DVI) $< > reftex.pdf: ${srcdir}/reftex.texi > @@ -537,7 +539,7 @@ > remember : $(infodir)/remember > $(infodir)/remember: remember.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > remember.dvi: ${srcdir}/remember.texi > $(ENVADD) $(TEXI2DVI) $< > remember.pdf: ${srcdir}/remember.texi > @@ -546,7 +548,7 @@ > sasl : $(infodir)/sasl > $(infodir)/sasl: sasl.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > sasl.dvi: ${srcdir}/sasl.texi > $(ENVADD) $(TEXI2DVI) $< > sasl.pdf: ${srcdir}/sasl.texi > @@ -555,7 +557,7 @@ > sc : $(infodir)/sc > $(infodir)/sc: sc.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > sc.dvi: ${srcdir}/sc.texi > $(ENVADD) $(TEXI2DVI) $< > sc.pdf: ${srcdir}/sc.texi > @@ -564,7 +566,7 @@ > semantic : $(infodir)/semantic > $(infodir)/semantic: semantic.texi sem-user.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > semantic.dvi: ${srcdir}/semantic.texi sem-user.texi > $(ENVADD) $(TEXI2DVI) $< > semantic.pdf: ${srcdir}/semantic.texi sem-user.texi > @@ -573,7 +575,7 @@ > ses : $(infodir)/ses > $(infodir)/ses: ses.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > ses.dvi: ${srcdir}/ses.texi > $(ENVADD) $(TEXI2DVI) $< > ses.pdf: ${srcdir}/ses.texi > @@ -582,7 +584,7 @@ > sieve : $(infodir)/sieve > $(infodir)/sieve: sieve.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > sieve.dvi: ${srcdir}/sieve.texi > $(ENVADD) $(TEXI2DVI) $< > sieve.pdf: ${srcdir}/sieve.texi > @@ -591,7 +593,7 @@ > smtpmail : $(infodir)/smtpmail > $(infodir)/smtpmail: smtpmail.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > smtpmail.dvi: ${srcdir}/smtpmail.texi > $(ENVADD) $(TEXI2DVI) $< > smtpmail.pdf: ${srcdir}/smtpmail.texi > @@ -600,7 +602,7 @@ > speedbar : $(infodir)/speedbar > $(infodir)/speedbar: speedbar.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > speedbar.dvi: ${srcdir}/speedbar.texi > $(ENVADD) $(TEXI2DVI) $< > speedbar.pdf: ${srcdir}/speedbar.texi > @@ -609,7 +611,7 @@ > tramp : $(infodir)/tramp > $(infodir)/tramp: tramp.texi trampver.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) -D emacs $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) -D emacs $< > tramp.dvi: ${srcdir}/tramp.texi trampver.texi > $(ENVADD) $(TEXI2DVI) $< > tramp.pdf: ${srcdir}/tramp.texi trampver.texi > @@ -618,7 +620,7 @@ > url : $(infodir)/url > $(infodir)/url: url.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > url.dvi: ${srcdir}/url.texi > $(ENVADD) $(TEXI2DVI) $< > url.pdf: ${srcdir}/url.texi > @@ -627,7 +629,7 @@ > vip : $(infodir)/vip > $(infodir)/vip: vip.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > vip.dvi: ${srcdir}/vip.texi > $(ENVADD) $(TEXI2DVI) $< > vip.pdf: ${srcdir}/vip.texi > @@ -636,7 +638,7 @@ > viper : $(infodir)/viper > $(infodir)/viper: viper.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > viper.dvi: ${srcdir}/viper.texi > $(ENVADD) $(TEXI2DVI) $< > viper.pdf: ${srcdir}/viper.texi > @@ -645,7 +647,7 @@ > widget : $(infodir)/widget > $(infodir)/widget: widget.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > widget.dvi: ${srcdir}/widget.texi > $(ENVADD) $(TEXI2DVI) $< > widget.pdf: ${srcdir}/widget.texi > @@ -654,7 +656,7 @@ > woman : $(infodir)/woman > $(infodir)/woman: woman.texi > $(mkinfodir) > - cd $(srcdir); $(MAKEINFO) $< > + cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) $< > woman.dvi: ${srcdir}/woman.texi > $(ENVADD) $(TEXI2DVI) $< > woman.pdf: ${srcdir}/woman.texi > ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-21 18:36 ` Werner LEMBERG @ 2011-01-22 16:00 ` Chong Yidong 2011-01-23 10:39 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Chong Yidong @ 2011-01-22 16:00 UTC (permalink / raw) To: Werner LEMBERG; +Cc: schwab, emacs-devel Werner LEMBERG <wl@gnu.org> writes: >>> It's not a limitation. It makes it possible to properly override it >>> without reconfiguring. >> >> OK. Here's what I now have. The patch is now much larger but still >> trivial IMHO. > > Ping! OK to apply? Looks fine to me (for the trunk). ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-22 16:00 ` Chong Yidong @ 2011-01-23 10:39 ` Werner LEMBERG 2011-01-23 11:45 ` Eli Zaretskii 0 siblings, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-23 10:39 UTC (permalink / raw) To: cyd; +Cc: schwab, emacs-devel >> Ping! OK to apply? > > Looks fine to me (for the trunk). Done. Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-23 10:39 ` Werner LEMBERG @ 2011-01-23 11:45 ` Eli Zaretskii 2011-01-23 11:57 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Eli Zaretskii @ 2011-01-23 11:45 UTC (permalink / raw) To: Werner LEMBERG; +Cc: emacs-devel > Date: Sun, 23 Jan 2011 11:39:16 +0100 (CET) > From: Werner LEMBERG <wl@gnu.org> > Cc: schwab@linux-m68k.org, emacs-devel@gnu.org > > >> Ping! OK to apply? > > > > Looks fine to me (for the trunk). > > Done. Thanks, but why did you do that in 4 separate commits? Why not a single commit? ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-23 11:45 ` Eli Zaretskii @ 2011-01-23 11:57 ` Werner LEMBERG 2011-01-23 12:41 ` Eli Zaretskii 0 siblings, 1 reply; 15+ messages in thread From: Werner LEMBERG @ 2011-01-23 11:57 UTC (permalink / raw) To: eliz; +Cc: emacs-devel > Thanks, but why did you do that in 4 separate commits? Why not a > single commit? This was motivated by the different ChangeLog files; however, the next time I can do it in a single commit. Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-23 11:57 ` Werner LEMBERG @ 2011-01-23 12:41 ` Eli Zaretskii 2011-01-23 14:11 ` Werner LEMBERG 0 siblings, 1 reply; 15+ messages in thread From: Eli Zaretskii @ 2011-01-23 12:41 UTC (permalink / raw) To: Werner LEMBERG; +Cc: emacs-devel > Date: Sun, 23 Jan 2011 12:57:37 +0100 (CET) > Cc: emacs-devel@gnu.org > From: Werner LEMBERG <wl@gnu.org> > > > > Thanks, but why did you do that in 4 separate commits? Why not a > > single commit? > > This was motivated by the different ChangeLog files Why is that a factor? > however, the next time I can do it in a single commit. Yes, please do. Files from a single changeset should be committed together. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: MAKEINFO variable not honoured 2011-01-23 12:41 ` Eli Zaretskii @ 2011-01-23 14:11 ` Werner LEMBERG 0 siblings, 0 replies; 15+ messages in thread From: Werner LEMBERG @ 2011-01-23 14:11 UTC (permalink / raw) To: eliz; +Cc: emacs-devel >> This was motivated by the different ChangeLog files > > Why is that a factor? Obviously, I was mistaken. Werner ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-01-23 14:11 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-01-01 12:21 MAKEINFO variable not honoured Werner LEMBERG 2011-01-03 5:23 ` Werner LEMBERG 2011-01-03 5:50 ` Glenn Morris 2011-01-03 6:20 ` Werner LEMBERG 2011-01-03 8:22 ` Andreas Schwab 2011-01-03 8:36 ` Werner LEMBERG 2011-01-03 8:50 ` Andreas Schwab 2011-01-03 18:23 ` Werner LEMBERG 2011-01-21 18:36 ` Werner LEMBERG 2011-01-22 16:00 ` Chong Yidong 2011-01-23 10:39 ` Werner LEMBERG 2011-01-23 11:45 ` Eli Zaretskii 2011-01-23 11:57 ` Werner LEMBERG 2011-01-23 12:41 ` Eli Zaretskii 2011-01-23 14:11 ` Werner LEMBERG
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/emacs.git https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.