Fix doc/*/makefile.w32-in according to 2011-01-23T10:22:21Z!wl@gnu.org-2011-01-23T10:38:14Z!wl@gnu.org.

 doc/lispref/makefile.w32-in (texinfodir): New variable.
 (usermanualdir): Remove as redundant with $(emacsdir).
 (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (texinputdir, $(infodir)/elisp): Use $(MAKEINFO_OPTS).
 doc/emacs/makefile.w32-in (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
 (emacs.html): New target.
 (clean): Remove emacs.html.
 doc/misc/makefile.w32-in (MAKEINFO): Remove options, leave only program name.
 (MAKEINFO_OPTS): New variable.
 (ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
 ($(infodir)/info, $(infodir)/ccmode, $(infodir)/ada-mode)
 ($(infodir)/pcl-cvs, $(infodir)/eshell, $(infodir)/cl)
 ($(infodir)/dbus, $(infodir)/dired-x, $(infodir)/ediff)
 ($(infodir)/flymake, $(infodir)/forms, $(infodir)/gnus)
 ($(infodir)/message, $(infodir)/emacs-mime, $(infodir)/sieve)
 ($(infodir)/pgg, $(infodir)/mh-e, $(infodir)/reftex)
 ($(infodir)/remember, $(infodir)/sasl, $(infodir)/sc)
 ($(infodir)/vip, $(infodir)/viper, $(infodir)/widget)
 ($(infodir)/efaq, $(infodir)/autotype, $(infodir)/calc)
 ($(infodir)/idlwave, $(infodir)/eudc, $(infodir)/ebrowse)
 ($(infodir)/woman, $(infodir)/speedbar, $(infodir)/tramp)
 ($(infodir)/ses, $(infodir)/smtpmail, $(infodir)/org)
 ($(infodir)/url, $(infodir)/newsticker, $(infodir)/nxml-mode)
 ($(infodir)/rcirc, $(infodir)/erc, $(infodir)/ert)
 ($(infodir)/epa, $(infodir)/mairix-el, $(infodir)/auth)
 ($(infodir)/eieio, $(infodir)/ede, $(infodir)/semantic)
 ($(infodir)/edt): Use $(MAKEINFO_OPTS).

6 files changed, 108 insertions, 61 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index e873e29f2d6..c5b31d70139 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (MAKEINFO): Remove options, leave only program name.
+	(MAKEINFO_OPTS): New variable.
+	(ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
+	(emacs.html): New target.
+	(clean): Remove emacs.html.
+
 2011-01-23  Werner Lemberg  <wl@gnu.org>
 
 	* Makefile.in (MAKEINFO): Now controlled by `configure'.
diff --git a/doc/emacs/makefile.w32-in b/doc/emacs/makefile.w32-in
index 422ae261395..bbbcaf0528b 100644
--- a/doc/emacs/makefile.w32-in
+++ b/doc/emacs/makefile.w32-in
@@ -27,7 +27,8 @@ srcdir=.
 infodir = $(srcdir)/../../info
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force -I$(srcdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/emacs
 DVI_TARGETS = 	emacs.dvi
@@ -40,7 +41,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-	 "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+	 "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 EMACS_XTRA=\
 	$(srcdir)/arevert-xtra.texi \
@@ -113,11 +114,14 @@ $(infodir)/dir:
 	$(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
 
 $(infodir)/emacs: $(EMACSSOURCES)
-	$(MAKEINFO) emacs.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) emacs.texi
 
 emacs.dvi: $(EMACSSOURCES)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs.texi
 
+emacs.html: $(EMACSSOURCES)
+	$(MAKEINFO) $(MAKEINFO_OPTS) --html -o $@ emacs.texi
+
 emacs-xtra.dvi: emacs-xtra.texi $(EMACS_XTRA)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-xtra.texi
 
@@ -127,6 +131,7 @@ mostlyclean:
 clean: mostlyclean
 	- $(DEL) *.dvi
 	- $(DEL) $(infodir)/emacs*
+	- $(DEL_TREE) emacs.html
 
 distclean: clean
 	- $(DEL) makefile
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b693eb3a217..be8803d4cb2 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (texinfodir): New variable.
+	(usermanualdir): Remove as redundant with $(emacsdir).
+	(MAKEINFO): Remove options, leave only program name.
+	(MAKEINFO_OPTS): New variable.
+	(texinputdir, $(infodir)/elisp): Use $(MAKEINFO_OPTS).
+
 2011-01-25  Chong Yidong  <cyd@stupidchicken.com>
             Richard Kim  <emacs18@gmail.com>
 
diff --git a/doc/lispref/makefile.w32-in b/doc/lispref/makefile.w32-in
index ee21d8762b9..e0bcd21f2c0 100644
--- a/doc/lispref/makefile.w32-in
+++ b/doc/lispref/makefile.w32-in
@@ -22,20 +22,24 @@
 srcdir = .
 
 infodir = $(srcdir)/../../info
-usermanualdir = $(srcdir)/../emacs
 
 # Directory with emacsver.texi.
 emacsdir = $(srcdir)/../emacs
+# Directory with the (customized) texinfo.tex file.
+texinfodir = $(srcdir)/../misc
 
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
 TEX=tex
 INSTALL_INFO = install-info
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force  -I$(srcdir) -I$(emacsdir)
 
 # The environment variable and its value to add $(srcdir) to the path
 # searched for TeX input files.
-texinputdir = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" /C
+texinputdir = $(srcdir)\..\..\nt\envadd.bat \
+		"TEXINPUTS=$(srcdir);$(texinputdir);$(TEXINPUTS)" \
+		"MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 # The name of the manual:
 VERSION=2.9
@@ -110,12 +114,10 @@ $(infodir)/dir:
 	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/elisp
 
 $(infodir)/elisp: $(srcs)
-	$(MAKEINFO) -I. -I$(srcdir) -I$(emacsdir) \
-	  -o $(infodir)/elisp $(srcdir)/elisp.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) -o $(infodir)/elisp $(srcdir)/elisp.texi
 
 elisp.dvi: $(srcs)
-	$(texinputdir) $(TEX) -I $(usermanualdir) -I$(emacsdir) \
-	  $(srcdir)/elisp.texi
+	$(texinputdir) $(TEX) $(srcdir)/elisp.texi
 
 clean:
 	- $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c37affbf87c..668d7ddfbaa 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (MAKEINFO): Remove options, leave only program name.
+	(MAKEINFO_OPTS): New variable.
+	(ENVADD, $(infodir)/emacs): Use $(MAKEINFO_OPTS).
+	($(infodir)/info, $(infodir)/ccmode, $(infodir)/ada-mode)
+	($(infodir)/pcl-cvs, $(infodir)/eshell, $(infodir)/cl)
+	($(infodir)/dbus, $(infodir)/dired-x, $(infodir)/ediff)
+	($(infodir)/flymake, $(infodir)/forms, $(infodir)/gnus)
+	($(infodir)/message, $(infodir)/emacs-mime, $(infodir)/sieve)
+	($(infodir)/pgg, $(infodir)/mh-e, $(infodir)/reftex)
+	($(infodir)/remember, $(infodir)/sasl, $(infodir)/sc)
+	($(infodir)/vip, $(infodir)/viper, $(infodir)/widget)
+	($(infodir)/efaq, $(infodir)/autotype, $(infodir)/calc)
+	($(infodir)/idlwave, $(infodir)/eudc, $(infodir)/ebrowse)
+	($(infodir)/woman, $(infodir)/speedbar, $(infodir)/tramp)
+	($(infodir)/ses, $(infodir)/smtpmail, $(infodir)/org)
+	($(infodir)/url, $(infodir)/newsticker, $(infodir)/nxml-mode)
+	($(infodir)/rcirc, $(infodir)/erc, $(infodir)/ert)
+	($(infodir)/epa, $(infodir)/mairix-el, $(infodir)/auth)
+	($(infodir)/eieio, $(infodir)/ede, $(infodir)/semantic)
+	($(infodir)/edt): Use $(MAKEINFO_OPTS).
+
 2011-01-26  Lars Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus.texi (Article Date): Document gnus-article-update-lapsed-header.
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 918d83539a2..1e497fe309f 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -31,7 +31,8 @@ infodir = $(srcdir)/../../info
 emacsdir = $(srcdir)/../emacs
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force -I$(emacsdir)
+MAKEINFO = makeinfo
+MAKEINFO_OPTS = --force -I$(emacsdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/ccmode \
 		$(infodir)/cl $(infodir)/dbus $(infodir)/dired-x \
@@ -71,7 +72,7 @@ INFOSOURCES = info.texi
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-	 "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
+	 "MAKEINFO=$(MAKEINFO) $(MAKEINFO_OPTS)" /C
 
 
 info: $(INFO_TARGETS)
@@ -93,65 +94,65 @@ $(infodir)/dir:
 # texi filename, contrary to GNU standards.
 
 $(infodir)/info: $(INFOSOURCES)
-	$(MAKEINFO) --no-split -o $@ info.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) --no-split -o $@ info.texi
 
 info.dvi: $(INFOSOURCES)
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/info.texi
 
 
 $(infodir)/ccmode: cc-mode.texi
-	$(MAKEINFO) cc-mode.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) cc-mode.texi
 cc-mode.dvi: cc-mode.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/cc-mode.texi
 
 $(infodir)/ada-mode: ada-mode.texi
-	$(MAKEINFO) ada-mode.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ada-mode.texi
 ada-mode.dvi: ada-mode.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ada-mode.texi
 
 $(infodir)/pcl-cvs: pcl-cvs.texi
-	$(MAKEINFO) pcl-cvs.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) pcl-cvs.texi
 pcl-cvs.dvi: pcl-cvs.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/pcl-cvs.texi
 
 $(infodir)/eshell: eshell.texi
-	$(MAKEINFO) eshell.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) eshell.texi
 eshell.dvi: eshell.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/eshell.texi
 
 $(infodir)/cl: cl.texi
-	$(MAKEINFO) cl.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) cl.texi
 cl.dvi: cl.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/cl.texi
 
 $(infodir)/dbus: dbus.texi
-	$(MAKEINFO) dbus.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) dbus.texi
 dbus.dvi: dbus.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/dbus.texi
 
 $(infodir)/dired-x: dired-x.texi
-	$(MAKEINFO) dired-x.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) dired-x.texi
 dired-x.dvi: dired-x.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/dired-x.texi
 
 $(infodir)/ediff: ediff.texi
-	$(MAKEINFO) ediff.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ediff.texi
 ediff.dvi: ediff.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ediff.texi
 
 $(infodir)/flymake: flymake.texi
-	$(MAKEINFO) flymake.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) flymake.texi
 flymake.dvi: flymake.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/flymake.texi
 
 $(infodir)/forms: forms.texi
-	$(MAKEINFO) forms.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) forms.texi
 forms.dvi: forms.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/forms.texi
 
 # gnus/message/emacs-mime/sieve/pgg are part of Gnus:
 $(infodir)/gnus: gnus.texi
-	$(MAKEINFO) gnus.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi
 gnus.dvi: gnus.texi
 	sed -e "/@iflatex/,/@end iflatex/d" $(srcdir)/gnus.texi > gnustmp.texi
 	$(ENVADD) $(TEXI2DVI) gnustmp.texi
@@ -159,77 +160,77 @@ gnus.dvi: gnus.texi
 	rm gnustmp.*
 #
 $(infodir)/message: message.texi
-	$(MAKEINFO) message.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) message.texi
 message.dvi: message.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/message.texi
 #
 $(infodir)/emacs-mime: emacs-mime.texi
-	$(MAKEINFO) --enable-encoding emacs-mime.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) --enable-encoding emacs-mime.texi
 emacs-mime.dvi: emacs-mime.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/emacs-mime.texi
 #
 $(infodir)/sieve: sieve.texi
-	$(MAKEINFO) sieve.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) sieve.texi
 sieve.dvi: sieve.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/sieve.texi
 #
 $(infodir)/pgg: pgg.texi
-	$(MAKEINFO) pgg.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) pgg.texi
 pgg.dvi: pgg.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/pgg.texi
 
 $(infodir)/mh-e: mh-e.texi
-	$(MAKEINFO) mh-e.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) mh-e.texi
 mh-e.dvi: mh-e.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/mh-e.texi
 
 $(infodir)/reftex: reftex.texi
-	$(MAKEINFO) reftex.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) reftex.texi
 reftex.dvi: reftex.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/reftex.texi
 
 $(infodir)/remember: remember.texi
-	$(MAKEINFO) remember.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) remember.texi
 remember.dvi: remember.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/remember.texi
 
 $(infodir)/sasl: sasl.texi
-	$(MAKEINFO) sasl.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) sasl.texi
 sasl.dvi: sasl.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/sasl.texi
 
 $(infodir)/sc: sc.texi
-	$(MAKEINFO) sc.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) sc.texi
 sc.dvi: sc.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/sc.texi
 
 $(infodir)/vip: vip.texi
-	$(MAKEINFO) vip.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) vip.texi
 vip.dvi: vip.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/vip.texi
 
 $(infodir)/viper: viper.texi
-	$(MAKEINFO) viper.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) viper.texi
 viper.dvi: viper.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/viper.texi
 
 $(infodir)/widget: widget.texi
-	$(MAKEINFO) widget.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) widget.texi
 widget.dvi: widget.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
-	$(MAKEINFO) faq.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) faq.texi
 faq.dvi: faq.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
 $(infodir)/autotype: autotype.texi
-	$(MAKEINFO) autotype.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) autotype.texi
 autotype.dvi: autotype.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
 
 $(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
-	$(MAKEINFO) calc.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) calc.texi
 
 calc.dvi: calc.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
@@ -237,112 +238,112 @@ calc.dvi: calc.texi $(emacsdir)/emacsver.texi
 # This is produced with --no-split to avoid making files whose
 # names clash on DOS 8+3 filesystems
 $(infodir)/idlwave: idlwave.texi
-	$(MAKEINFO) --no-split idlwave.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) --no-split idlwave.texi
 idlwave.dvi: idlwave.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/idlwave.texi
 
 $(infodir)/eudc: eudc.texi
-	$(MAKEINFO) eudc.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) eudc.texi
 eudc.dvi: eudc.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/eudc.texi
 
 $(infodir)/ebrowse: ebrowse.texi
-	$(MAKEINFO) ebrowse.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ebrowse.texi
 ebrowse.dvi: ebrowse.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ebrowse.texi
 
 $(infodir)/woman: woman.texi
-	$(MAKEINFO) woman.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) woman.texi
 woman.dvi: woman.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/woman.texi
 
 $(infodir)/speedbar: speedbar.texi
-	$(MAKEINFO) speedbar.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) speedbar.texi
 speedbar.dvi: speedbar.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/speedbar.texi
 
 $(infodir)/tramp: tramp.texi
-	$(MAKEINFO) tramp.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) tramp.texi
 tramp.dvi: tramp.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/tramp.texi
 
 $(infodir)/ses: ses.texi
-	$(MAKEINFO) ses.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ses.texi
 ses.dvi: ses.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ses.texi
 
 $(infodir)/smtpmail: smtpmail.texi
-	$(MAKEINFO) smtpmail.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) smtpmail.texi
 smtpmail.dvi: smtpmail.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/smtpmail.texi
 
 $(infodir)/org: org.texi
-	$(MAKEINFO) org.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) org.texi
 org.dvi: org.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/org.texi
 
 $(infodir)/url: url.texi
-	$(MAKEINFO) url.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) url.texi
 url.dvi: url.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/url.texi
 
 $(infodir)/newsticker: newsticker.texi
-	$(MAKEINFO) newsticker.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) newsticker.texi
 newsticker.dvi: newsticker.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/newsticker.texi
 
 $(infodir)/nxml-mode: nxml-mode.texi
-	$(MAKEINFO) nxml-mode.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) nxml-mode.texi
 nxml-mod.dvi: nxml-mode.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/nxml-mode.texi
 
 $(infodir)/rcirc: rcirc.texi
-	$(MAKEINFO) rcirc.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) rcirc.texi
 rcirc.dvi: rcirc.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/rcirc.texi
 
 $(infodir)/erc: erc.texi
-	$(MAKEINFO) erc.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) erc.texi
 erc.dvi: erc.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/erc.texi
 
 $(infodir)/ert: ert.texi
-	$(MAKEINFO) ert.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ert.texi
 ert.dvi: ert.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ert.texi
 
 $(infodir)/epa: epa.texi
-	$(MAKEINFO) epa.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) epa.texi
 epa.dvi: epa.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/epa.texi
 
 $(infodir)/mairix-el: mairix-el.texi
-	$(MAKEINFO) mairix-el.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) mairix-el.texi
 mairix-el.dvi: mairix-el.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/mairix-el.texi
 
 $(infodir)/auth: auth.texi
-	$(MAKEINFO) auth.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) auth.texi
 auth.dvi: auth.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/auth.texi
 
 $(infodir)/eieio: eieio.texi
-	$(MAKEINFO) eieio.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) eieio.texi
 eieio.dvi: eieio.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/eieio.texi
 
 $(infodir)/ede: ede.texi
-	$(MAKEINFO) ede.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) ede.texi
 ede.dvi: ede.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/ede.texi
 
 $(infodir)/semantic: semantic.texi
-	$(MAKEINFO) semantic.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) semantic.texi
 semantic.dvi: semantic.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/semantic.texi
 
 $(infodir)/edt: edt.texi
-	$(MAKEINFO) edt.texi
+	$(MAKEINFO) $(MAKEINFO_OPTS) edt.texi
 edt.dvi: edt.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/edt.texi