setup: remove the "build three times in a row" kludge now that #229 is fixed, and...

diff --git a/Makefile b/Makefile
index 0bd4048d95e5d4d9e339144ade9f9d2ff430d718..8858b54351b041d3f1339610ea755425fcd6f97e 100644 (file)
--- 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: