From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 May 2007 17:11:53 +0000 (+0000)
Subject:  r12676@catbus:  nickm | 2007-05-07 13:11:38 -0400
X-Git-Tag: tor-0.2.0.1-alpha~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89753e2163b68e15f9ad64c62446e01c3aa15334;p=thirdparty%2Ftor.git

 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 b5cffb443e..744ea35b67 100644
--- 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