[asterisk-commits] qwell: trunk r43397 - in /trunk: ./ build_tools/make_version

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Wed Sep 20 18:20:11 2006
New Revision: 43397

URL: http://svn.digium.com/view/asterisk?rev=43397&view=rev
Log:
Merged revisions 43396 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43396 | qwell | 2006-09-20 16:19:25 -0700 (Wed, 20 Sep 2006) | 2 lines

fix minor typo in the way version is handled

........

Modified:
    trunk/   (props changed)
    trunk/build_tools/make_version

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Sep 20 18:20:11 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392
+/branches/1.4:1-43376,43383,43386,43388,43392,43396

Modified: trunk/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/trunk/build_tools/make_version?rev=43397&r1=43396&r2=43397&view=diff
==============================================================================
--- trunk/build_tools/make_version (original)
+++ trunk/build_tools/make_version Wed Sep 20 18:20:11 2006
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -f ${1}/.version ]; then
-	cat ${1}.version
+	cat ${1}/.version
 elif [ -f ${1}/.svnrevision ]; then
 	echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
 elif [ -d .svn ]; then