From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 31 Oct 2011 17:37:39 +0000 (+0200)
Subject: Fix distribution tarball for the MS-DOS build.
X-Git-Tag: emacs-pretest-24.0.92~244
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0bd3cb7b2f44639e1da2245b086cedeabbfe46cf;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 2cd3f8eef85..fba4a2401e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
 2011-10-25  Nali Toja  <nalitoja@gmail.com>  (tiny change)
 
 	* configure.in (HAVE_GNU_MAKE): Respect MAKE env-var.  (Bug#9868)
diff --git a/make-dist b/make-dist
index a428686cc84..b7043b28d8f 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 \
+	      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 \`nt/icons'"
 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)
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 78ea6ebf1c5..eeb363e951f 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* sed3v2.inp (insrcdir): Comment out definition.
+	$(insrcdir): Edit into MS-DOS existence test.
+
 2011-09-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* mainmake.v2 (boot): Condition the value on the existence of
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 346f4e07e77..3b2065157e0 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -49,4 +49,6 @@ s!^	\./!	!
 /^UTILITIES *=/,/^$/{
   s/movemail[^ ]* *//
 }
+/^insrcdir=/s/^.*$/\#&/
+/^	 *\$(insrcdir) ||/s,\$(insrcdir) ||,command.com /c if not exist $<,