From: Brian Warner <warner@lothar.com>
Date: Thu, 12 Jan 2012 21:06:54 +0000 (-0800)
Subject: Makefile: fix 'make-version' to use git-or-darcs, not just darcs
X-Git-Url: https://git.rkrishnan.org/pf/vdrive?a=commitdiff_plain;h=f62c25f419eb108cea535890f238f820ec7e58b1;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: fix 'make-version' to use git-or-darcs, not just darcs
---

diff --git a/Makefile b/Makefile
index 9b4225db..38bb6479 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,10 @@ SOURCES=src/allmydata src/buildtest static misc bin/tahoe-script.template twiste
 
 .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