r12676@catbus: nickm | 2007-05-07 13:11:38 -0400

 When we cannot find a micro-revision number, do not overwrite an already-present micro-revision.i.

svn:r10134

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index b5cffb443e4e8edf99a8fabe4e3c8625176beed3..744ea35b6764978ff322da73daeb6ba2f1ccc4c4 100644 (file)
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -66,10 +66,11 @@ micro-revision.i: FORCE
             echo \"$$rev\" > micro-revision.tmp;                \
           fi;                                                   \
         fi;                                                     \
-       if test ! -f micro-revision.tmp; then                   \
-         echo '""' > micro-revision.tmp;                       \
-       fi;                                                     \
-       if test ! -f micro-revision.i || \
+       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 "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \
          mv micro-revision.tmp micro-revision.i;               \
        fi