Revert last change

2 files changed, 4 insertions, 9 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 977def73eed..92be8efdee7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -7,11 +7,6 @@
 
         * tramp.texi (Remote processes): Add `shell-command'.
 
-2008-02-05  Jason Rumney  <jasonr@gnu.org>
-
-        * makefile.w32-in (info): Depend on $(infodir)/dir
-        ($(infodir)/dir): Depend on info files.
-
 2008-01-28  Michael Sperber  <sperber@deinprogramm.de>
 
         * gnus.texi (Mail Source Specifiers): Document `group' specifier.
diff --git a/doc/misc/makefile.w32-in b/doc/misc/makefile.w32-in
index 4da32e9e473..b0a8f0f1e64 100644
--- a/doc/misc/makefile.w32-in
+++ b/doc/misc/makefile.w32-in
@@ -64,7 +64,7 @@ ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
          "MAKEINFO=$(MAKEINFO) -I$(srcdir)" /C
 
 
-info: $(INFO_TARGETS) $(infodir)/dir
+info: $(INFO_TARGETS)
 
 dvi: $(DVI_TARGETS)
 
@@ -73,15 +73,15 @@ dvi: $(DVI_TARGETS)
 # to exist in the build directory.
 # In a distribution of Emacs, the Info files should be up to date.
 
+$(infodir)/dir:
+        $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
+
 # The following target uses an explicit -o switch to work around
 # the @setfilename directive in info.texi, which is required for
 # the Texinfo distribution.
 # Some Windows ports of makeinfo seem to require -o to come before the
 # texi filename, contrary to GNU standards.
 
-$(infodir)/dir: $(INFO_TARGETS)
-        $(MULTI_INSTALL_INFO) --info-dir=$(infodir) $(INFO_TARGETS)
-
 $(infodir)/info: $(INFOSOURCES)
         $(MAKEINFO) --no-split -o $@ info.texi