setup: switch back from using "misc/dependencies/setup.py easy_install --always-unzip...

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 b2f2875a49dee663858b6c9c33e8a0b7a9e9460b..e95bbd8c2c56bcb2a01fe489d40862e204d55fef 100644 (file)
--- 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