Merge from trunk.

2 files changed, 6 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bd7618e0a82..63108cae9a9 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * makefile.w32-in ($(DOC)): Use DOC rather than DOC-X.
+
 2013-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * make-docfile.c (search_lisp_doc_at_eol) [DEBUG]: Fix typo,
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 5ec559ff985..9656a3badec 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -292,10 +292,10 @@ $(DOC):		stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(l
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1)
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp2)
                 "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(OTHER_PLATFORM_SUPPORT)
-                $(CP) $(DOC) ../etc/DOC-X
+                $(CP) $(DOC) ../etc/DOC
                 - mkdir "../src/$(OBJDIR)"
                 - mkdir "../src/$(OBJDIR)/etc"
-                $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC-X
+                $(CP) $(DOC) ../src/$(OBJDIR)/etc/DOC
 
 {$(BLD)}.$(O){$(BLD)}.exe:
                 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $*.$(O) $(LIBS)