From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 29 Jan 2009 20:59:52 +0000 (-0700)
Subject: setup: remove the "build three times in a row" kludge now that #229 is fixed, and... 
X-Git-Tag: allmydata-tahoe-1.3.0~117
X-Git-Url: https://git.rkrishnan.org/uri/%3C?a=commitdiff_plain;h=4e6c09d306d37558518c1aff8a7009a553ee0380;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove the "build three times in a row" kludge now that #229 is fixed, and spell build "build" instead of "build_tahoe"
---

diff --git a/Makefile b/Makefile
index 0bd4048d..8858b543 100644
--- a/Makefile
+++ b/Makefile
@@ -62,16 +62,7 @@ src/allmydata/_version.py:
 # three invocations.
 
 build: src/allmydata/_version.py
-	$(MAKE) build-once || $(MAKE) build-once || $(MAKE) build-once
-
-# setuptools has a bug (Issue17, see tahoe #229 for details) that causes it
-# to mishandle dependencies that are installed in non-site-directories,
-# including the /var/lib/ place that debian's python-support system uses. We
-# add this debian/ubuntu-specific directory (via $SITEDIRARG) to the setup.py
-# command line to work around this. Some day this will probably be fixed in
-# setuptools.
-build-once:
-	$(PYTHON) setup.py build_tahoe
+	$(PYTHON) setup.py build
 	touch .built
 
 # 'make install' will do the following: