Fix doc/misc/makefile.w32.in like 2010-10-28T07:21:43Z!rgm@gnu.org 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 --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 029d2e039bbcb6d36333d940e83553a6fe68e5fd..587bbba3159dc09c2e4ca7fe85d3bad277205320 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -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 --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index f488773841184c1ed33dd5605b0b5b2d7afeffcb..fd3b1476b5591633c32e8d808951474324678167 100644 (file)
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -32,7 +32,7 @@ infodir = $(srcdir)/../../info
 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 @@ INFOSOURCES = info.texi
 
 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 @@ widget.dvi: widget.texi
        $(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 @@ $(infodir)/autotype: autotype.texi
 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