From: Brian Warner <warner@lothar.com>
Date: Fri, 5 Feb 2016 20:32:02 +0000 (-0800)
Subject: Makefile: run pyflakes as 'pyflakes', not python `which pyflakes`
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/(%5B%5E?a=commitdiff_plain;h=75135af65fa95dfcb51d5025a824f0971fafbdbc;p=tahoe-lafs%2Ftahoe-lafs.git

Makefile: run pyflakes as 'pyflakes', not python `which pyflakes`

This funky invocation syntax was introduced in 2007 (commit 56ad518),
with a comment of "make pyflakes run faster". I no longer have any idea
why that might have been the case. It's time to simplify this, because
some of our buildslaves have pipsi-installed "pyflakes" on their $PATH,
which use a "python" that's different than the one on $PATH.
---

diff --git a/Makefile b/Makefile
index 6df6bd6a..89e2b41b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ default: build
 
 PYTHON=python
 export PYTHON
+PYFLAKES=pyflakes
+export PYFLAKES
 
 # setup.py will extend sys.path to include our support/lib/... directory
 # itself. It will also create it in the beginning of the 'develop' command.
@@ -132,7 +134,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-	@$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+	$(PYFLAKES) $(SOURCES) |sort |uniq
 	@echo
 
 .PHONY: check-umids