From 4bb75db568993c30645f044a410a5f34865069f9 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Fri, 11 Jan 2008 18:40:43 -0700 Subject: [PATCH] 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. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.45.2