Merged from miles@gnu.org--gnu-2005 (patch 115, 540-542)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-540
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-541
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-542
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-115
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-419

2 files changed, 9 insertions, 3 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 5767b49aaed..4cf0da4b644 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-11  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (../src/config.h): Don't overwrite. Print a
+        message instead.
+        (../src/paths.h): Removed.
+
 2005-07-27  Juanma Barranquero  <lekktu@gmail.com>
 
         * .cvsignore: Don't ignore fns-* and fns.el, which are no longer
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index bfda0f25d5f..a1a96098bd8 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -300,9 +300,9 @@ cleanall:	clean
 # Headers we would preprocess if we could.
 #
 ../src/config.h:        ../nt/$(CONFIG_H)
-                        $(CP) $(ALL_DEPS) $@
-../src/paths.h:         ../nt/paths.h
-                        $(CP) $(ALL_DEPS) $@
+                        echo config.h has changed. Re-run configure.bat.
+                        exit -1
+
 getopt.h:               getopt_.h
                         $(CP) $(ALL_DEPS) $@