From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Apr 2007 13:17:57 +0000 (+0000)
Subject:  r12559@catbus:  nickm | 2007-04-30 09:17:54 -0400
X-Git-Tag: tor-0.2.0.1-alpha~222
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=420df2ce15172d2738758debd6135ce1accb267b;p=thirdparty%2Ftor.git

 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.


svn:r10057
---

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 73a3e346e2..ef079a45c1 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -36,7 +36,7 @@ micro-revision.i: FORCE
 	  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                            \