From: Jason Rumney <jasonr@gnu.org>
Date: Sun, 11 Sep 2005 22:29:23 +0000 (+0000)
Subject: (../src/config.h): Don't overwrite. Print a message instead.
X-Git-Tag: emacs-pretest-22.0.90~7160
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=df1b21421be7370610e8a56e665683619f9df87b;p=emacs.git

(../src/config.h): Don't overwrite. Print a message instead.
(../src/paths.h): Removed.
---

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) $@