Fix previous commit.

 config.bat: Use config.in and Makefile.in from src/ and lib/, if
 they exist there, else from autogen/.
 make-dist: Don't add `autogen'.

3 files changed, 11 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index fba4a2401e9..3d8f5758afa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
 2011-10-31  Eli Zaretskii  <eliz@gnu.org>
 
-        * make-dist (tempdir): Create `autogen'.
-        (msdos): Add depfiles.bat and inttypes.h.
-        (autogen): Put README, config.in, and Makefile.in ionto the
-        distribution, they are needed for the MS-DOS build.
+        * config.bat: Use config.in and Makefile.in from src/ and lib/, if
+        they exist there, else from autogen/.
+
+        * make-dist (msdos): Add depfiles.bat and inttypes.h.
 
 2011-10-25  Nali Toja  <nalitoja@gmail.com>  (tiny change)
 
diff --git a/config.bat b/config.bat
index cbbcf0cfcd5..aa2a3a4f905 100644
--- a/config.bat
+++ b/config.bat
@@ -156,9 +156,11 @@ rm -f epaths.tmp
 

 rem   Create "config.h"

 rm -f config.h2 config.tmp

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

+if exist config.in sed -e '' config.in > config.tmp

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

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

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

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

+if exist ..\autogen\config.in 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

@@ -290,7 +292,8 @@ 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 < ..\autogen\Makefile.in > makefile.tmp

+If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp

+If Exist ..\autogen\Makefile.in 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/

diff --git a/make-dist b/make-dist
index b7043b28d8f..ebbb11e87cc 100755
--- a/make-dist
+++ b/make-dist
@@ -297,7 +297,7 @@ for subdir in site-lisp \
               nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
               `find etc lisp admin -type d` \
               doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
-              info m4 msdos autogen \
+              info m4 msdos \
               nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
               nextstep/Cocoa/Emacs.base/Contents \
               nextstep/Cocoa/Emacs.base/Contents/Resources \
@@ -422,10 +422,6 @@ echo "Making links to \`msdos'"
  ln depfiles.bat inttypes.h ../${tempdir}/msdos
  ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos)
 
-echo "Making links to \`autogen'"
-(cd autogen
- ln README config.in Makefile.in ../${tempdir}/autogen)
-
 echo "Making links to \`nextstep'"
 (cd nextstep
  ln ChangeLog README INSTALL ../${tempdir}/nextstep)