[Emacs-diffs] /srv/bzr/emacs/trunk r102150: Fix doc/misc/makefile.w32.in like revno 102137 did with Makefile.in.

[Eli Zaretskii]

------------------------------------------------------------
revno: 102150
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-29 12:49:27 +0200
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/makefile.w32-in

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2010-10-28 07:21:43 +0000
+++ b/doc/misc/ChangeLog        2010-10-29 10:49:27 +0000
@@ -1,3 +1,10 @@
+2010-10-29  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * Makefile.in (MAKEINFO, ENVADD): Add $emacsdir to include path.

=== modified file 'doc/misc/makefile.w32-in'
--- a/doc/misc/makefile.w32-in  2010-10-09 21:38:04 +0000
+++ b/doc/misc/makefile.w32-in  2010-10-29 10:49:27 +0000
@@ -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