diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-02 19:13:15 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-02 19:13:15 +0000 |
| commit | da758f4a1854174ca8cb95be7e7e2abd8bd5cd3b (patch) | |
| tree | 8d9ab93a9d03a039293741c36b83f0393cb51757 /src/or/Makefile.am | |
| parent | 744d955bb32b8e0e05fd4d17661e053002fd846a (diff) | |
| download | tor-da758f4a1854174ca8cb95be7e7e2abd8bd5cd3b.tar.gz tor-da758f4a1854174ca8cb95be7e7e2abd8bd5cd3b.zip | |
r12634@catbus: nickm | 2007-05-02 15:13:13 -0400
Shell tweaks suggested by weasel.
svn:r10094
Diffstat (limited to 'src/or/Makefile.am')
| -rw-r--r-- | src/or/Makefile.am | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 00939cf131..b5cffb443e 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -43,8 +43,7 @@ micro-revision.i: FORCE svn info ../.. | \ sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \ || true; \ - else \ - if test x`which svk` != x -a -d ~/.svk; then \ + elif test x`which svk` != x && test -d ~/.svk; then \ location=../..; \ rev=x; \ while test x$$rev = xx; do \ @@ -67,11 +66,11 @@ micro-revision.i: FORCE echo \"$$rev\" > micro-revision.tmp; \ fi; \ fi; \ - fi; \ if test ! -f micro-revision.tmp; then \ echo '""' > micro-revision.tmp; \ fi; \ - if test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \ + if test ! -f micro-revision.i || \ + test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \ mv micro-revision.tmp micro-revision.i; \ fi |