Merge from trunk

1 files changed, 4 insertions, 3 deletions

diff --git a/config.bat b/config.bat
index 4288f6537e6..e480a4b9bc8 100644
--- a/config.bat
+++ b/config.bat
@@ -156,9 +156,9 @@ rm -f epaths.tmp
 

 rem   Create "config.h"

 rm -f config.h2 config.tmp

-sed -e '' config.in > config.tmp

+sed -e '' ../autogen/config.in > config.tmp

 if "%X11%" == "" goto src4

-sed -f ../msdos/sed2x.inp <config.in >config.tmp

+sed -f ../msdos/sed2x.inp < ..\autogen\config.in > config.tmp

 :src4

 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2

 Rem See if DECL_ALIGN can be supported with this GCC

@@ -283,11 +283,12 @@ If Exist getopt.in.h update getopt.in.h getopt.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 stdio.in.h update stdio.in.h stdio.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/sedlibcf.inp < ..\autogen\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/