summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-22 14:52:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:47 -0500
commit7cc35ba06644669e64460b03c141a23ad7a516d7 (patch)
tree1d7311277e07b8bc8e4c0b043ff13f1a57c89d66
parentf72cf069f235d7e8ad04e82b71a592c7ce560b8d (diff)
downloadsamba-7cc35ba06644669e64460b03c141a23ad7a516d7.tar.gz
samba-7cc35ba06644669e64460b03c141a23ad7a516d7.tar.xz
samba-7cc35ba06644669e64460b03c141a23ad7a516d7.zip
r824: merge from: SAMBA_4_0:
use 'Last Change Rev:' instead of 'Revision:' from the svn info output for setting the SVN_REVISION in version.h metze
-rwxr-xr-xsource/script/mkversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index 917a9ed1ae3..492ecaade2a 100755
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -48,7 +48,7 @@ fi
if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
HAVESVN=no
svn info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVN=yes
- TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep Revision: |sed -e 's/Revision: \([0-9]*\).*/\1/'`
+ TMP_REVISION=`(svn info ${SOURCE_DIR} 2>/dev/null || svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Last Changed Rev.*:' |sed -e 's/Last Changed Rev.*: \([0-9]*\).*/\1/'`
if test x"${HAVESVN}" = x"no";then
HAVESVK=no
svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes