[Emacs-diffs] /srv/bzr/emacs/trunk r106259: Fix previous commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106259
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-31 19:49:10 +0200
message:
  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'.
modified:
  ChangeLog
  config.bat
  make-dist

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-10-31 17:37:39 +0000
+++ b/ChangeLog 2011-10-31 17:49:10 +0000
@@ -1,9 +1,9 @@
 2011-10-31  Eli Zaretskii  <address@hidden>
 
-       * 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  <address@hidden>  (tiny change)
 

=== modified file 'config.bat'
--- a/config.bat        2011-09-29 12:08:36 +0000
+++ b/config.bat        2011-10-31 17:49:10 +0000
@@ -156,9 +156,11 @@
 
 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 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/

=== modified file 'make-dist'
--- a/make-dist 2011-10-31 17:37:39 +0000
+++ b/make-dist 2011-10-31 17:49:10 +0000
@@ -297,7 +297,7 @@
              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 @@
  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)