1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00

Merge branch 'python_fixes' into OP-1324_fix_build_when_python_isnt_python2

This commit is contained in:
James Duley 2014-08-19 11:50:41 +12:00
commit 47e110050d

View File

@ -690,7 +690,7 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
else
# not installed, hope it's in the path...
# $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
ifeq ($(findstring Python 2,$(shell python --version)), Python 2)
ifeq ($(findstring Python 2,$(shell python --version 2>&1)), Python 2)
export PYTHON := python
else
export PYTHON := python2