From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 26 Feb 2011 09:27:05 +0000 (+0200)
Subject: Fix the MS-DOS configury due to new gnulib modules.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~721^2~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=945d8b4444ccea2a3c3e9ac69b679c80ee0e00a5;p=emacs.git

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 e8cd16a2c50..25c1bc904d1 100644
--- 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 7ebfc74b801..4288f6537e6 100644
--- a/config.bat
+++ b/config.bat
@@ -280,17 +280,20 @@ cd lib
 Rem Rename files like djtar on plain DOS filesystem would.
 If Exist c++defs.h update c++defs.h cxxdefs.h
 If Exist getopt.in.h update getopt.in.h getopt.in-h
-If Exist stddef.in.h update stddef.in.h  stddef.in-h
 If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
+If Exist stddef.in.h update stddef.in.h  stddef.in-h
+If Exist stdint.in.h update stdint.in.h  stdint.in-h
 If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
+If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
 If Exist time.in.h update time.in.h time.in-h
 If Exist unistd.in.h update unistd.in.h unistd.in-h
 sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
 sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
 rm -f makefile.tmp
+Rem Create .Po files for new files in lib/
 If Not Exist deps\stamp mkdir deps
-If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
-If Not Exist deps\stamp echo deps-stamp > deps\stamp
+for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
+echo deps-stamp > deps\stamp
 cd ..
 rem   ----------------------------------------------------------------------
 Echo Configuring the lisp directory...
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index f1cdf510a06..d4979796901 100644
--- 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 22fcfc3dcd6..901a53cbb0d 100644
--- 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/.
 
 rem   ----------------------------------------------------------------------
 
-echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat
+echo %1 | sed -e "s,\(.*\)\.c,@if not exist deps\\\1.Po echo # dummy > deps\\\1.Po," > tdepfile.bat
 call tdepfile
 del tdepfile.bat