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.
This commit is contained in:
Zooko O'Whielacronx 2008-01-11 18:40:43 -07:00
parent 6a6d198e1d
commit 4bb75db568

View File

@ -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