resolve makefile conflicts

and surpress echo of echoes

diff --git a/Makefile b/Makefile
index 711c93653685fc22fb2d74c9fe517c78087251f6..6db5442c338c12dcaac8056eaef0b8dd19d23ca0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -47,10 +47,11 @@ 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 install --prefix="$(SUPPORT)"
+       @echo PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" $(PYTHON) misc/dependencies/setup.py easy_install --prefix="$(SUPPORT)" --always-unzip misc/dependencies
        @-PYTHONPATH="$(PYTHONPATH)$(PATHSEP)$(SUPPORTLIB)$(PATHSEP)" \
-         $(PYTHON) misc/dependencies/build-deps-setup.py install \
-        --prefix="$(SUPPORT)"
+         $(PYTHON) misc/dependencies/setup.py easy_install \
+        --prefix="$(SUPPORT)" --always-unzip misc/dependencies || \
+       echo "Build of Tahoe's bundled, automatically built dependent libraries failed -- please see docs/install.html for instructions."
 
 # The following target is here because I don't know how to tell the buildmaster
 # to start instructing his slaves to "build-auto-deps" instead of instructing
@@ -107,7 +108,7 @@ src/allmydata/_version.py:
        $(MAKE) make-version
 
 build: src/allmydata/_version.py
-       echo $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG)
+       @echo $(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG)
        @$(PYTHON) ./setup.py build_ext -i $(INCLUDE_DIRS_ARG) $(LIBRARY_DIRS_ARG) || \
                echo "Build of Allmydata-Tahoe failed -- please see docs/install.html for instructions."
        chmod +x bin/tahoe