From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 18:00:24 +0000 (+0100)
Subject: Thu Jan 12 21:06:54 GMT 2012  Brian Warner <warner@lothar.com>
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/frontends/rgr-080307.php?a=commitdiff_plain;h=bb0bf50c5cb21d598ff14476a9d06e18368884e5;p=tahoe-lafs%2Ftahoe-lafs.git

Thu Jan 12 21:06:54 GMT 2012  Brian Warner <warner@lothar.com>
  * Makefile: fix 'make-version' to use git-or-darcs, not just darcs
---

diff --git a/Makefile b/Makefile
index ac08c257..ba83cdbd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,10 @@ SOURCES=src/allmydata src/buildtest static misc/build_helpers bin/tahoe-script.t
 
 .PHONY: make-version build
 
-# The 'darcsver' setup.py command comes in the 'darcsver' package:
-# http://pypi.python.org/pypi/darcsver It is necessary only if you want to
-# automatically produce a new _version.py file from the current darcs history.
+# This is necessary only if you want to automatically produce a new
+# _version.py file from the current git/darcs history.
 make-version:
-	$(PYTHON) ./setup.py darcsver --count-all-patches
+	$(PYTHON) ./setup.py update_version
 
 .built:
 	$(MAKE) build