Merge from trunk.

3 files changed, 7 insertions, 3 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 2a602be59c9..b66871e319b 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more.
+
 2013-05-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/README.W32 b/nt/README.W32
index 19c148bbf0b..a2881ce1914 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -29,7 +29,7 @@ See the end of the file for license conditions.
   Along with this file should be six subdirectories (bin, etc, info,
   lisp, leim, site-lisp).  If you have downloaded the barebin
   distribution, then it will contain only the bin directory and the
-  built in documentation in etc/DOC-X, the rest of the subdirectories
+  built in documentation in etc/DOC, the rest of the subdirectories
   are in the src distribution, which the barebin distribution is
   designed to be used with.
 
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 0c2f6324188..79ca22bf44e 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -315,7 +315,7 @@ clean:	clean-other-dirs-$(MAKETYPE)
         - $(DEL) $(COMPILER_TEMP_FILES)
         - $(DEL_TREE) $(OBJDIR)
         - $(DEL) stamp_BLD
-        - $(DEL) ../etc/DOC ../etc/DOC-X
+        - $(DEL) ../etc/DOC
 
 clean-other-dirs-nmake:
         cd ..\lib
@@ -375,7 +375,7 @@ top-distclean:
         - $(DEL_TREE) oo
         - $(DEL_TREE) oo-spd
         - $(DEL) stamp_BLD
-        - $(DEL) ../etc/DOC ../etc/DOC-X
+        - $(DEL) ../etc/DOC
         - $(DEL) config.log Makefile
         - $(DEL) ../README.W32