r12634@catbus: nickm | 2007-05-02 15:13:13 -0400

 Shell tweaks suggested by weasel.

svn:r10094

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 00939cf13124d0a40b5f3c1a5fcb6652e4a7ce0e..b5cffb443e4e8edf99a8fabe4e3c8625176beed3 100644 (file)
--- 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