diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-06-01 18:02:41 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-06-01 18:02:41 +0000 |
| commit | 7c3f418e398f3a08f9572427322e0976337d6acd (patch) | |
| tree | 6471b080a9bc081175da312dc5a0de1b5937a63c | |
| parent | 6df38f52db78ae35d850939e394642aa8e5275b8 (diff) | |
| download | tor-7c3f418e398f3a08f9572427322e0976337d6acd.tar.gz tor-7c3f418e398f3a08f9572427322e0976337d6acd.zip | |
r13139@catbus: nickm | 2007-06-01 14:02:40 -0400
Add some ;trues, and tabify.
svn:r10441
| -rw-r--r-- | src/or/Makefile.am | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index c0646df31b..eb880621a2 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -39,41 +39,41 @@ 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 2>&1`" ; then \ - svn info ../.. | \ + @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`" && test -d ~/.svk/local; then \ - location=../..; \ - rev=x; \ - while test x$$rev = xx; do \ - x=`svk info $$location | \ - sed -n 's/^Mirrored From:.*, Rev\. \([0-9][0-9]*\)/\1/p'`; \ - if test x$$x != x; then \ - rev=$$x; \ - break; \ - else \ - loc=`svk info $$location | \ - sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \ - if test x$$loc = x; then \ - break; \ - else \ - location=/$$loc; \ - fi; \ - fi; \ - done; \ - if test x$$rev != x; then \ - echo \"$$rev\" > micro-revision.tmp; \ - fi; \ - fi; \ - if test ! -f micro-revision.tmp ; then \ - if test ! -f micro-revision.i ; then \ - echo '""' > micro-revision.i; \ - fi; \ - elif test ! -f micro-revision.i || \ - test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ - mv micro-revision.tmp micro-revision.i; \ - fi + || true; \ + elif test -x "`which svk 2>&1;true`" && test -d ~/.svk/local; then \ + location=../..; \ + rev=x; \ + while test x$$rev = xx; do \ + x=`svk info $$location | \ + sed -n 's/^Mirrored From:.*, Rev\. \([0-9][0-9]*\)/\1/p'`; \ + if test x$$x != x; then \ + rev=$$x; \ + break; \ + else \ + loc=`svk info $$location | \ + sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \ + if test x$$loc = x; then \ + break; \ + else \ + location=/$$loc; \ + fi; \ + fi; \ + done; \ + if test x$$rev != x; then \ + echo \"$$rev\" > micro-revision.tmp; \ + fi; \ + fi; \ + if test ! -f micro-revision.tmp ; then \ + if test ! -f micro-revision.i ; then \ + echo '""' > micro-revision.i; \ + fi; \ + elif test ! -f micro-revision.i || \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ + mv micro-revision.tmp micro-revision.i; \ + fi; true #Dummy target to ensure that micro-revision.i _always_ gets built. FORCE: |