[or-cvs] r10057: Fix bug 421: Only set the revision number from SVK if we hav (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-04-30 09:17:57 -0400 (Mon, 30 Apr 2007)
New Revision: 10057

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r12559@catbus:  nickm | 2007-04-30 09:17:54 -0400
 Fix bug 421: Only set the revision number from SVK if we have a runnable svk _and_ a ~/.svk directory.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12559] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-04-30 11:10:45 UTC (rev 10056)
+++ tor/trunk/src/or/Makefile.am	2007-04-30 13:17:57 UTC (rev 10057)
@@ -36,7 +36,7 @@
 	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.i \
 	     || true;                                           \
 	else                                                    \
-	if test x`which svk` != x; then                         \
+	if test x`which svk` != x -a -d ~/.svk; then            \
           location=../..;                                       \
           rev=x;                                                \
           while test x$$rev = xx; do                            \