ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 10:46:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resolve makefile conflicts

Browse Source 
and surpress echo of echoes
This commit is contained in:
robk-tahoe 2008-01-09 21:21:15 -07:00
parent 8f4f3bf6cc
commit 38ff96b2f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

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