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).

2 files changed, 17 insertions, 7 deletions

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 \