summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-06-02 15:40:10 +0000
committerNick Mathewson <nickm@torproject.org>2007-06-02 15:40:10 +0000
commitc2dc8f4623e76bec4bf556b0843887551219816c (patch)
treec0826b8e65332ec67a202fb75961c2bd576358ab
parentaee7f016242c0fea9243be1c82a67b804bfb6792 (diff)
downloadtor-c2dc8f4623e76bec4bf556b0843887551219816c.tar.gz
tor-c2dc8f4623e76bec4bf556b0843887551219816c.zip
r13158@catbus: nickm | 2007-06-02 11:40:05 -0400
On systems with svk, do not clobber micro-revision.i when building from a tarball. svn:r10452
-rw-r--r--ChangeLog3
-rw-r--r--src/or/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf065853e5..a2ab967dce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@ Changes in version 0.2.0.2-alpha - 2007-??-??
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
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index eb880621a2..497ec3e9be 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -62,7 +62,7 @@ micro-revision.i: FORCE
fi; \
fi; \
done; \
- if test x$$rev != x; then \
+ if test x$$rev != xx; then \
echo \"$$rev\" > micro-revision.tmp; \
fi; \
fi; \