diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-22 14:52:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:51:47 -0500 |
| commit | b4594cec6e527b9e91a979fa6b3152a6e530efaa (patch) | |
| tree | 9b04d3e1a2cef0395d193f0eb4a96d46ad595564 | |
| parent | 130cc39567e612722459084b7e193f4e200b69ea (diff) | |
| download | samba-b4594cec6e527b9e91a979fa6b3152a6e530efaa.tar.gz samba-b4594cec6e527b9e91a979fa6b3152a6e530efaa.tar.bz2 samba-b4594cec6e527b9e91a979fa6b3152a6e530efaa.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
(This used to be commit 7cc35ba06644669e64460b03c141a23ad7a516d7)
| -rwxr-xr-x | source3/script/mkversion.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index 917a9ed1ae..492ecaade2 100755 --- a/source3/script/mkversion.sh +++ b/source3/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 |