From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Sat, 12 Jan 2008 01:40:43 +0000 (-0700)
Subject: setup: switch back from using "misc/dependencies/setup.py easy_install --always-unzip... 
X-Git-Url: https://git.rkrishnan.org/COPYING.GPL?a=commitdiff_plain;h=4bb75db568993c30645f044a410a5f34865069f9;p=tahoe-lafs%2Ftahoe-lafs.git

setup: switch back from using "misc/dependencies/setup.py easy_install --always-unzip misc/dependencies" to using "misc/dependencies/setup.py install"
because I don't fully understand the former, I suspect it of being implicated in the current buildslave redness, and we require --always-unzip solely for py2exe.
---

diff --git a/Makefile b/Makefile
index b2f2875a..e95bbd8c 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,9 @@ TRIAL=PYTHONUNBUFFERED=1 $(TRIALCMD) --rterrors $(REACTOROPT)
 build-auto-deps: check-deps
 	mkdir -p "$(SUPPORTLIB)"
 	@echo PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
-		$(PYTHON) misc/dependencies/build-deps-setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies
+		$(PYTHON) misc/dependencies/build-deps-setup.py install --prefix="$(SUPPORT)"
 	@PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
-		$(PYTHON) misc/dependencies/build-deps-setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies || \
+		$(PYTHON) misc/dependencies/build-deps-setup.py install --prefix="$(SUPPORT)" || \
 		( echo "Build of Tahoe's bundled, automatically built dependent libraries failed -- please see docs/install.html for instructions." && false )
 
 # The following target is here because I don't know how to tell the buildmaster