Fix the MS-DOS configury due to new gnulib modules.

 config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
 depfiles.bat even if lib/deps already exist.
 msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
 name does not already exist in the deps/ subdirectory.

diff --git a/ChangeLog b/ChangeLog
index e8cd16a2c50ff41f75f068d6b56d1fc15e28bcd6..25c1bc904d1803ecce082252f8f8fd3090675544 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * config.bat: Rename stdint.in.h and sys_stat.in.h.  Call
+       depfiles.bat even if lib/deps already exist.
+
 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:

diff --git a/config.bat b/config.bat
index 7ebfc74b801605b5cb355ce22550d192dfca1532..4288f6537e6ee37ebbd874a0dfcd15f21cc54c2c 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -280,17 +280,20 @@ cd lib
 Rem Rename files like djtar on plain DOS filesystem would.\r
 If Exist c++defs.h update c++defs.h cxxdefs.h\r
 If Exist getopt.in.h update getopt.in.h getopt.in-h\r
-If Exist stddef.in.h update stddef.in.h  stddef.in-h\r
 If Exist stdbool.in.h update stdbool.in.h stdbool.in-h\r
+If Exist stddef.in.h update stddef.in.h  stddef.in-h\r
+If Exist stdint.in.h update stdint.in.h  stdint.in-h\r
 If Exist stdlib.in.h update stdlib.in.h stdlib.in-h\r
+If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h\r
 If Exist time.in.h update time.in.h time.in-h\r
 If Exist unistd.in.h update unistd.in.h unistd.in-h\r
 sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp\r
 sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile\r
 rm -f makefile.tmp\r
+Rem Create .Po files for new files in lib/\r
 If Not Exist deps\stamp mkdir deps\r
-If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f\r
-If Not Exist deps\stamp echo deps-stamp > deps\stamp\r
+for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f\r
+echo deps-stamp > deps\stamp\r
 cd ..\r
 rem   ----------------------------------------------------------------------\r
 Echo Configuring the lisp directory...\r

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index f1cdf510a06685d8bcd3c8ee93516f4d63164cd0..d49797969011b88be43a9514eaf0b0751e1ca59e 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * depfiles.bat: Create a dummy .Po file only if a file by the same
+       name does not already exist in the deps/ subdirectory.
+
 2011-02-19  Eli Zaretskii  <eliz@gnu.org>
 
        * depfiles.bat: New file.

diff --git a/msdos/depfiles.bat b/msdos/depfiles.bat
index 22fcfc3dcd6eba55c76ceeb7b2b9adb4675cd460..901a53cbb0d4f8bc38df6eb75d016118507e6d9b 100644 (file)
--- a/msdos/depfiles.bat
+++ b/msdos/depfiles.bat
@@ -20,6 +20,6 @@ rem   along with GNU Emacs.  If not, see http://www.gnu.org/licenses/.
 \r
 rem   ----------------------------------------------------------------------\r
 \r
-echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat\r
+echo %1 | sed -e "s,\(.*\)\.c,@if not exist deps\\\1.Po echo # dummy > deps\\\1.Po," > tdepfile.bat\r
 call tdepfile\r
 del tdepfile.bat\r