diff options
| author | Romain Francoise <romain@orebokech.com> | 2010-05-24 13:35:41 +0200 |
|---|---|---|
| committer | Romain Francoise <romain@orebokech.com> | 2010-05-24 13:35:41 +0200 |
| commit | c17e9c60bea331e361600d9acb9f101e56df2eef (patch) | |
| tree | 42c162def00683372ff8f0dd0a97e84eb89e6fad /make-dist | |
| parent | 6ec0221e1232cd6060124bf4c2e59210a75b110e (diff) | |
| download | emacs-c17e9c60bea331e361600d9acb9f101e56df2eef.tar.gz | |
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.
Diffstat (limited to 'make-dist')
| -rwxr-xr-x | make-dist | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/make-dist b/make-dist index 87d879d31c4..11969042db1 100755 --- a/make-dist +++ b/make-dist @@ -121,8 +121,8 @@ while [ $# -gt 0 ]; do 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 @@ then 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 |