[or-cvs] r10440: Ah. Of course. You spell "is there an svn" as 'test -x "`whi (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-01 13:49:37 -0400 (Fri, 01 Jun 2007)
New Revision: 10440

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r13137 at 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.



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

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-06-01 10:20:37 UTC (rev 10439)
+++ tor/trunk/src/or/Makefile.am	2007-06-01 17:49:37 UTC (rev 10440)
@@ -39,11 +39,11 @@
 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                            \