Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de

2 files changed, 5 insertions, 1 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 04df41c7d9a..12931661658 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-11  Glenn Morris  <rgm@gnu.org>
+
+        * Makefile.in (INFO_INSTALL): Update for 2013-08-28 DOCMISC_W32 change.
+
 2014-06-10  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout.
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 62f50af0e43..4e9f8f18526 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -72,7 +72,7 @@ INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
         url vhdl-mode vip viper widget wisent woman
 
 ## Info files to install on current platform.
-INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_INFO_W32)
+INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
 
 ## Info files to build on current platform.
 ## This is all of them, even though they might not all get installed,