diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-06-01 10:20:37 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-06-01 10:20:37 +0000 |
| commit | 0af91800f9807594c108bceed17531d031954363 (patch) | |
| tree | ad70df327be97fb6e5da137cddfa1e4cc9d511fc /src/or | |
| parent | 3600d2f708fb9657ff505deff2999cde31632c80 (diff) | |
| download | tor-0af91800f9807594c108bceed17531d031954363.tar.gz tor-0af91800f9807594c108bceed17531d031954363.zip | |
r13131@catbus: nickm | 2007-06-01 06:20:29 -0400
Test for ~/.svk/local, not ~/.svk. Eschew use of test -a and test -o. Bulletproof more against odd shells.
svn:r10439
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 2b35ef75c7..5fda7e5cbc 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 -a x`which svn` != x ; then \ + @if test -d ../../.svn && test x`which svn` != x ; 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; then \ + elif test x`which svk` != x && test -d ~/.svk/local; then \ location=../..; \ rev=x; \ while test x$$rev = xx; do \ @@ -71,7 +71,7 @@ micro-revision.i: FORCE echo '""' > micro-revision.i; \ fi; \ elif test ! -f micro-revision.i || \ - test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ mv micro-revision.tmp micro-revision.i; \ fi |