Commit b4594cec authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Gerald (Jerry) Carter
Browse files

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)
parent 130cc395

source3/script/mkversion.sh

+1 −1
Original line number Diff line number Diff line
@@ -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