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 73a3e346e26eaeb8174b257ed42c758f6f91cca5..ef079a45c1cb4c3536e9efe51b00397d920c2364 100644 (file)
--- 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                            \