svn commit: samba r2006 - branches/SAMBA_3_0/source trunk/source

tpot at samba.org tpot at samba.org
Tue Aug 24 11:26:53 GMT 2004


Author: tpot
Date: 2004-08-24 11:26:53 +0000 (Tue, 24 Aug 2004)
New Revision: 2006

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2006&nolog=1

Log:
Fix bug 1653 discovered by Luke Mewburn.  The script code to generate the
svn version number broke out-of-tree builds.

Modified:
   branches/SAMBA_3_0/source/configure.in
   trunk/source/configure.in


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2004-08-24 10:07:49 UTC (rev 2005)
+++ branches/SAMBA_3_0/source/configure.in	2004-08-24 11:26:53 UTC (rev 2006)
@@ -8,10 +8,10 @@
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED
 
-SMB_VERSION_STRING=`cat include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
+SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 
-SAMBA_VERSION_SVN_REVISION=`cat include/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-`
+SAMBA_VERSION_SVN_REVISION=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-`
 if test -n "${SAMBA_VERSION_SVN_REVISION}";then
 	echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}"
 fi

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2004-08-24 10:07:49 UTC (rev 2005)
+++ trunk/source/configure.in	2004-08-24 11:26:53 UTC (rev 2006)
@@ -8,10 +8,10 @@
 AC_DISABLE_STATIC
 AC_ENABLE_SHARED
 
-SMB_VERSION_STRING=`cat include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
+SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 
-SAMBA_VERSION_SVN_REVISION=`cat include/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-`
+SAMBA_VERSION_SVN_REVISION=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-`
 if test -n "${SAMBA_VERSION_SVN_REVISION}";then
 	echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}"
 fi



More information about the samba-cvs mailing list