From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Thu, 10 Jan 2008 04:21:15 +0000 (-0700)
Subject: resolve makefile conflicts
X-Git-Url: https://git.rkrishnan.org/%5B%5E?a=commitdiff_plain;h=38ff96b2f86d8e2ef7d3332a543401f9cb092a64;p=tahoe-lafs%2Ftahoe-lafs.git

resolve makefile conflicts

and surpress echo of echoes
---

diff --git a/Makefile b/Makefile
index 711c9365..6db5442c 100644
--- 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