# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1288349367 -7200
# Node ID 9450439a37a306bc884494149a38822c0d74227c
# Parent  6f50064cb399475303b409e207a1ac5cc04f2ea6
Fix doc/misc/makefile.w32.in like revno 102137 did with Makefile.in.

 makefile.w32-in (MAKEINFO): Add -I$(emacsdir).
 (ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO).
 ($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO).
 ($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi.

diff -r 6f50064cb399 -r 9450439a37a3 doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Fri Oct 29 12:43:38 2010 +0200
+++ b/doc/misc/ChangeLog	Fri Oct 29 12:49:27 2010 +0200
@@ -1,3 +1,10 @@
+2010-10-29  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (MAKEINFO): Add -I$(emacsdir).
+	(ENVADD): Remove extra -I$(emacsdir), included in $(MAKEINFO).
+	($(infodir)/efaq): Remove -I$(emacsdir), included in $(MAKEINFO).
+	($(infodir)/calc, calc.dvi): Depend on $(emacsdir)/emacsver.texi.
+
 2010-10-28  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.
diff -r 6f50064cb399 -r 9450439a37a3 doc/misc/makefile.w32-in
--- a/doc/misc/makefile.w32-in	Fri Oct 29 12:43:38 2010 +0200
+++ b/doc/misc/makefile.w32-in	Fri Oct 29 12:49:27 2010 +0200
@@ -32,7 +32,7 @@
 emacsdir = $(srcdir)/../emacs
 
 # The makeinfo program is part of the Texinfo distribution.
-MAKEINFO = makeinfo --force
+MAKEINFO = makeinfo --force -I$(emacsdir)
 MULTI_INSTALL_INFO = $(srcdir)\..\..\nt\multi-install-info.bat
 INFO_TARGETS = $(infodir)/ccmode \
 		$(infodir)/cl $(infodir)/dbus $(infodir)/dired-x \
@@ -70,7 +70,7 @@
 
 TEXI2DVI = texi2dvi
 ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
-	 "MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(emacsdir)" /C
+	 "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
 
 
 info: $(INFO_TARGETS)
@@ -218,7 +218,7 @@
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/widget.texi
 
 $(infodir)/efaq: faq.texi $(emacsdir)/emacsver.texi
-	$(MAKEINFO) -I$(emacsdir) faq.texi
+	$(MAKEINFO) faq.texi
 faq.dvi: faq.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/faq.texi
 
@@ -227,10 +227,10 @@
 autotype.dvi: autotype.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/autotype.texi
 
-$(infodir)/calc: calc.texi
+$(infodir)/calc: calc.texi $(emacsdir)/emacsver.texi
 	$(MAKEINFO) calc.texi
 
-calc.dvi: calc.texi
+calc.dvi: calc.texi $(emacsdir)/emacsver.texi
 	$(ENVADD) $(TEXI2DVI) $(srcdir)/calc.texi
 
 # This is produced with --no-split to avoid making files whose