(../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 5767b49aaed803c0dfa3aececc0f398527466fa7..4cf0da4b644c47f9452a919e443069c6d3709d42 100644 (file)
--- 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 bfda0f25d5fac396212e39119f36a80ff8d22217..a1a96098bd87dc07ac9168af17a99e280e005c16 100644 (file)
--- 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) $@