# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1282333760 -10800
# Node ID c15a51661b50182a7ea6f9ec06389e88cea75d26
# Parent  b6004420857bf8361bf1eba1d31fb0a39cd86882# Parent  2973623571929234309528425453c44f9cd2e146
Fix version string in top-level MSDOS Makefile.

 msdos/mainmake.v2 (version): Update due to change in emacs.c.
 src/emacs.c <emacs_version>: Add a comment regarding msdos/mainmake.v2's
 dependency on the syntax of this declaration.

diff -r b6004420857b -r c15a51661b50 msdos/ChangeLog
--- a/msdos/ChangeLog	Fri Aug 20 17:31:38 2010 +0300
+++ b/msdos/ChangeLog	Fri Aug 20 22:49:20 2010 +0300
@@ -1,3 +1,7 @@
+2010-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* mainmake.v2 (version): Update due to change in emacs.c.
+
 2010-08-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* sed1v2.inp (UNEXEC_OBJ): Edit to unexcoff.o, due to renaming of
diff -r b6004420857b -r c15a51661b50 msdos/mainmake.v2
--- a/msdos/mainmake.v2	Fri Aug 20 17:31:38 2010 +0300
+++ b/msdos/mainmake.v2	Fri Aug 20 22:49:20 2010 +0300
@@ -65,7 +65,7 @@
 top_srcdir := $(subst \,/,$(shell cd))
 
 # Find out which version of Emacs this is.
-version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
+version := ${shell sed -n -e '/^static const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c}
 
 # Q: Do we need to bootstrap?
 # A: Only if we find admin/admin.el, i.e. we are building out of 
diff -r b6004420857b -r c15a51661b50 src/ChangeLog
--- a/src/ChangeLog	Fri Aug 20 17:31:38 2010 +0300
+++ b/src/ChangeLog	Fri Aug 20 22:49:20 2010 +0300
@@ -1,3 +1,8 @@
+2010-08-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* emacs.c <emacs_version>: Add a comment regarding
+	msdos/mainmake.v2's dependency on the syntax of this declaration.
+
 2010-08-20  Eli Zaretskii  <eliz@gnu.org>
 
 	* dispnew.c (buffer_posn_from_coords): Fix calculation of buffer
diff -r b6004420857b -r c15a51661b50 src/emacs.c
--- a/src/emacs.c	Fri Aug 20 17:31:38 2010 +0300
+++ b/src/emacs.c	Fri Aug 20 22:49:20 2010 +0300
@@ -91,6 +91,8 @@
 #endif
 #endif
 
+/* If you change the following line, remember to update
+   msdos/mainmake.v2 which gleans the Emacs version from it!  */
 static const char emacs_copyright[] = "Copyright (C) 2010 Free Software Foundation, Inc.";
 static const char emacs_version[] = "24.0.50";