summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-01 17:49:37 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-01 17:49:37 +0000
commit6df38f52db78ae35d850939e394642aa8e5275b8 (patch)
tree9e50b4095a7480f079d5008e4a5218aeee47febf
parent0af91800f9807594c108bceed17531d031954363 (diff)
downloadtor-6df38f52db78ae35d850939e394642aa8e5275b8.tar.gz
tor-6df38f52db78ae35d850939e394642aa8e5275b8.zip
r13137@catbus: nickm | 2007-06-01 13:49:34 -0400
Ah. Of course. You spell "is there an svn" as 'test -x "`which svn 2>&1`"'. Perfectly reasonable. Don't know why I didn't think of it in the first place. svn:r10440
-rw-r--r--src/or/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 5fda7e5cbc..c0646df31b 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -39,11 +39,11 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
tor_main.o: micro-revision.i
micro-revision.i: FORCE
- @if test -d ../../.svn && test x`which svn` != x ; then \
+ @if test -d ../../.svn && test -x "`which svn 2>&1`" ; then \
svn info ../.. | \
sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
|| true; \
- elif test x`which svk` != x && test -d ~/.svk/local; then \
+ elif test -x "`which svk 2>&1`" && test -d ~/.svk/local; then \
location=../..; \
rev=x; \
while test x$$rev = xx; do \