[or-cvs] r10522: Check for non-standard SVK directories properly. Inspired by (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-07 12:14:55 -0400 (Thu, 07 Jun 2007)
New Revision: 10522

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r13292 at catbus:  nickm | 2007-06-06 17:34:15 -0400
 Check for non-standard SVK directories properly.  Inspired by debian bug #420899 and related discussion on SVK list.



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

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-06-07 15:07:33 UTC (rev 10521)
+++ tor/trunk/src/or/Makefile.am	2007-06-07 16:14:55 UTC (rev 10522)
@@ -41,11 +41,15 @@
 tor_main.o: micro-revision.i
 
 micro-revision.i: FORCE
-	@if test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
+	@svkdir=$$SVKROOT; \
+	if test "x$$svkdir" = x ; then \
+	  svkdir=$$HOME/.svk; \
+	fi; \
+	if test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
 	  svn info ../.. |					\
 	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
 	     || true;						\
-	elif test -x "`which svk 2>&1;true`" && test -d ~/.svk/local; then \
+	elif test -x "`which svk 2>&1;true`" && test -d $$svkdir/local; then \
 	  location=../..;					\
 	  rev=x;						\
 	  while test x$$rev = xx; do				\