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.

11 files changed, 32 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 715c6abd5b0..60376bc4158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+        * lib/makefile.w32-in (MS_W32_H): Update for new ms-w32.h location.
+
 2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Merge from gnulib (Bug#12116), incorporating:
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)
diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index 4cebc727513..db451d542a8 100644
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft Windows API.
-# Copyright (C) 2011 Free Software Foundation, Inc.
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -71,7 +71,7 @@ NT_INC		= $(EMACS_ROOT)/nt/inc
 
 C_CTYPE_H      = $(GNU_LIB)/c-ctype.h \
                  $(NT_INC)/stdbool.h
-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)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 075c6c7a389..ec93d25a991 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-renamed-files-alist): Add ms-w32.h.
+
 2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Obsolete alias inactivate-current-input-method-function (Bug#10150).
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 20cc38cd9c2..6c70642ba83 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -578,6 +578,7 @@ in the repository.")
     ("w32console.c" . "w32term.c")
     ("unexnt.c" . "unexw32.c")
     ("s/windowsnt.h" . "s/ms-w32.h")
+    ("s/ms-w32.h" . "inc/ms-w32.h")
     ("winnt.el" . "w32-fns.el")
     ("config.emacs" . "configure")
     ("configure.in" . "configure.ac")
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7e97faad311..e903b4375db 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+        * inc/ms-w32.h: Move here from ../src/s.
+        * config.nt (config_opsysfile): Change to <ms-w32.h>.
+
 2012-08-01  Juanma Barranquero  <lekktu@gmail.com>
 
         * config.nt: Sync with autogen/config.in.
diff --git a/nt/config.nt b/nt/config.nt
index 97889438cc6..4687630589b 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    This file is intentionally kept in sync with autogen/config.in to
    ease maintenance.  Please do not remove non-Windows related stuff
    unless strictly necessary.  Also, before adding anything here
-   consider whether src/s/ms-w32.h would be a better place; this is
+   consider whether inc/ms-w32.h would be a better place; this is
    particularly true for gcc vs. MSVC conditional defines, MinGW or
    MSVC specific code, and macros not already defined in config.in.  */
 
@@ -1538,7 +1538,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Some platforms that do not use configure define this to include extra
    configuration information. */
-#define config_opsysfile "s/ms-w32.h"
+#define config_opsysfile <ms-w32.h>
 
 /* A replacement for va_copy, if needed.  */
 #define gl_va_copy(a,b) ((a) = (b))
diff --git a/src/s/ms-w32.h b/nt/inc/ms-w32.h
index 8c02a8b8a66..8c02a8b8a66 100644
--- a/src/s/ms-w32.h
+++ b/nt/inc/ms-w32.h
diff --git a/src/ChangeLog b/src/ChangeLog
index 50c6d18e242..906107a667d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-02  Glenn Morris  <rgm@gnu.org>
+
+        * s/ms-w32.h: Move to ../nt/inc.
+        * makefile.w32-in (TAGS, TAGS-gmake, MS_W32_H):
+        Update for new ms-w32.h location.
+
 2012-08-02  Paul Eggert  <eggert@cs.ucla.edu>
 
         Port to Solaris 8.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index ee5424cf757..31dc94f7964 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -339,7 +339,7 @@ cleanall:	clean
 ##
 ## This works only with GNU Make.
 
-TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/s/ms-w32.h
+TAGS: $(OBJ0) $(OBJ1) $(OBJ2) $(CURDIR)/../nt/inc/ms-w32.h
         $(MAKE) $(MFLAGS) TAGS-$(MAKETYPE)
 
 TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
@@ -353,7 +353,7 @@ TAGS-gmake:
           $(OBJ1_c)
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
           $(OBJ2_c) \
-          $(CURDIR)/*.h $(CURDIR)/s/ms-w32.h
+          $(CURDIR)/*.h $(CURDIR)/../nt/inc/ms-w32.h
 
 TAGS-nmake:
         echo This target is not supported with NMake
@@ -403,7 +403,7 @@ CHARSET_H      = $(SRC)/charset.h \
                  $(GNU_LIB)/verify.h
 CODING_H       = $(SRC)/coding.h \
                  $(SRC)/composite.h
-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)