comparison make-dist @ 110951:85fe6b298326

* make-dist: Remove the unnecessary $shortversion.
author Glenn Morris <rgm@gnu.org>
date Tue, 12 Oct 2010 01:01:11 -0700
parents 77c12a233de2
children 495ef3733d20
comparison
equal deleted inserted replaced
110950:77c12a233de2 110951:85fe6b298326
151 esac 151 esac
152 fi 152 fi
153 fi 153 fi
154 154
155 ### Find out which version of Emacs this is. 155 ### Find out which version of Emacs this is.
156 shortversion=`grep 'char emacs_version' src/emacs.c \
157 | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
158 version=`grep 'char emacs_version' src/emacs.c \ 156 version=`grep 'char emacs_version' src/emacs.c \
159 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` 157 | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'`
160 if [ ! "${version}" ]; then 158 if [ ! "${version}" ]; then
161 echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2 159 echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2
162 exit 1 160 exit 1
163 fi 161 fi
164 162
165 echo Version numbers are $version and $shortversion 163 echo Version number is $version
166 164
167 if [ $update = yes ]; 165 if [ $update = yes ];
168 then 166 then
169 if grep -s "@set EMACSVER *${shortversion}" ./doc/emacs/emacsver.texi > /dev/null; then 167 if grep -s "@set EMACSVER *${version}" ./doc/emacs/emacsver.texi > /dev/null; then
170 true 168 true
171 else 169 else
172 echo "You must update the version number in \`./doc/emacs/emacsver.texi'" 170 echo "You must update the version number in \`./doc/emacs/emacsver.texi'"
173 sleep 5 171 sleep 5
174 fi 172 fi