# HG changeset patch
# User Romain Francoise <romain@orebokech.com>
# Date 1274700941 -7200
# Node ID f7bbe35cec2355702a88552cbc87d2be454cef91
# Parent  60bc561d59c54088cb55907f9b560405a11cc636
Adapt make-dist to new version location.

* make-dist: Look for version in src/emacs.c.
Use lisp/subr.el rather than lisp/version.el for location check.

diff -r 60bc561d59c5 -r f7bbe35cec23 ChangeLog
--- a/ChangeLog	Sun May 23 21:02:25 2010 +0200
+++ b/ChangeLog	Mon May 24 13:35:41 2010 +0200
@@ -1,3 +1,8 @@
+2010-05-24  Romain Francoise  <romain@orebokech.com>
+
+	* make-dist: Look for version in src/emacs.c.
+	Use lisp/subr.el rather than lisp/version.el for location check.
+
 2010-05-21  Glenn Morris  <rgm@gnu.org>
 
 	* configure.in (MKDEPDIR): Parallel build tweak.
diff -r 60bc561d59c5 -r f7bbe35cec23 make-dist
--- a/make-dist	Sun May 23 21:02:25 2010 +0200
+++ b/make-dist	Mon May 24 13:35:41 2010 +0200
@@ -121,8 +121,8 @@
 done
 
 ### Make sure we're running in the right place.
-if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
-  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
+if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
+  echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2
   echo "${progname} must be run in the top directory of the Emacs" >&2
   echo "distribution tree.  cd to that directory and try again." >&2
   exit 1
@@ -150,12 +150,12 @@
 fi
 
 ### Find out which version of Emacs this is.
-shortversion=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
+shortversion=`grep 'char emacs_version' src/emacs.c \
 	 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
-version=`grep 'defconst[	 ]*emacs-version' lisp/version.el \
+version=`grep 'char emacs_version' src/emacs.c \
 	 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
 if [ ! "${version}" ]; then
-  echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2
+  echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
   exit 1
 fi