[Emacs-diffs] /srv/bzr/emacs/trunk r106258: Fix distribution tarball for the MS-DOS build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106258
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-31 19:37:39 +0200
message:
  Fix distribution tarball for the MS-DOS build.
  
   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.
   msdos/sed3v2.inp (insrcdir): Comment out definition.
   $(insrcdir): Edit into MS-DOS existence test.
modified:
  ChangeLog
  make-dist
  msdos/ChangeLog
  msdos/sed3v2.inp

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-10-25 16:41:26 +0000
+++ b/ChangeLog 2011-10-31 17:37:39 +0000
@@ -1,3 +1,10 @@
+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.
+
 2011-10-25  Nali Toja  <address@hidden>  (tiny change)
 
        * configure.in (HAVE_GNU_MAKE): Respect MAKE env-var.  (Bug#9868)

=== modified file 'make-dist'
--- a/make-dist 2011-10-18 06:19:28 +0000
+++ b/make-dist 2011-10-31 17:37:39 +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 \
+             info m4 msdos autogen \
              nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \
              nextstep/Cocoa/Emacs.base/Contents \
              nextstep/Cocoa/Emacs.base/Contents/Resources \
@@ -419,8 +419,13 @@
 echo "Making links to \`msdos'"
 (cd msdos
  ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/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)

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2011-09-29 12:00:18 +0000
+++ b/msdos/ChangeLog   2011-10-31 17:37:39 +0000
@@ -1,3 +1,8 @@
+2011-10-31  Eli Zaretskii  <address@hidden>
+
+       * sed3v2.inp (insrcdir): Comment out definition.
+       $(insrcdir): Edit into MS-DOS existence test.
+
 2011-09-29  Eli Zaretskii  <address@hidden>
 
        * mainmake.v2 (boot): Condition the value on the existence of

=== modified file 'msdos/sed3v2.inp'
--- a/msdos/sed3v2.inp  2011-02-19 17:54:18 +0000
+++ b/msdos/sed3v2.inp  2011-10-31 17:37:39 +0000
@@ -49,4 +49,6 @@
 /^UTILITIES *=/,/^$/{
   s/movemail[^ ]* *//
 }
+/^insrcdir=/s/^.*$/\#&/
+/^      *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<,