Move NT-specific include file to the NT include directory

* nt/inc/ms-w32.h: Move here from ../src/s.
* nt/config.nt (config_opsysfile): Change to <ms-w32.h>.

* s/ms-w32.h: Move to ../nt/inc.
* src/makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H):
Update for new ms-w32.h location.

* lib-src/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.

* lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.

* lisp/emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h.

2 files changed, 5 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 4dc648b410b..1e543346707 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
+
 2012-08-01  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in (config_h): New variable.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 8c9482b9194..26605b8ba4e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -360,7 +360,7 @@ SRC		= $(EMACS_ROOT)/src
 NT_INC          = $(EMACS_ROOT)/nt/inc
 GNU_LIB         = $(EMACS_ROOT)/lib
 
-MS_W32_H       = $(SRC)/s/ms-w32.h \
+MS_W32_H       = $(NT_INC)/ms-w32.h \
                  $(NT_INC)/sys/stat.h
 CONF_POST_H    = $(SRC)/conf_post.h \
                  $(MS_W32_H)