[or-cvs] r10452: On systems with svk, do not clobber micro-revision.i when bu (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-06-02 11:40:10 -0400 (Sat, 02 Jun 2007)
New Revision: 10452

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/Makefile.am
Log:
 r13158 at catbus:  nickm | 2007-06-02 11:40:05 -0400
 On systems with svk, do not clobber micro-revision.i when building from a tarball.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13158] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-06-02 15:26:57 UTC (rev 10451)
+++ tor/trunk/ChangeLog	2007-06-02 15:40:10 UTC (rev 10452)
@@ -11,6 +11,9 @@
 
   o Minor build issues:
     - Clear up some MIPSPro compiler warnings.
+    - When building from a tarball on a machine that happens to have SVK
+      installed, report the micro-revision as whatever version existed
+      in the tarball, not as "x".
 
 
 Changes in version 0.2.0.1-alpha - 2007-06-01

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-06-02 15:26:57 UTC (rev 10451)
+++ tor/trunk/src/or/Makefile.am	2007-06-02 15:40:10 UTC (rev 10452)
@@ -62,7 +62,7 @@
 	      fi;						\
 	    fi;							\
 	  done;							\
-	  if test x$$rev != x; then				\
+	  if test x$$rev != xx; then				\
 	    echo \"$$rev\" > micro-revision.tmp;		\
 	  fi;							\
 	fi;							\