From bc8ccb7be7f7bc30cf7ff9ad2ee68aee7b8cbef5 Mon Sep 17 00:00:00 2001 From: Corvus Corax Date: Sat, 16 Aug 2014 23:59:37 +0200 Subject: [PATCH] Revert "Revert "Merge remote-tracking branch 'origin/parched/OP-1324_fix_build_when_python_isnt_python2' into next"" This reverts commit 449653f01e4221f104579d47b25e2b0d9664a890. --- ground/openpilotgcs/src/python.pri | 2 +- make/tools.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri index 739fc2cc9..62d03795f 100644 --- a/ground/openpilotgcs/src/python.pri +++ b/ground/openpilotgcs/src/python.pri @@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR) PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\" } else { # not found, hope it's in the path... - PYTHON = \"python\" + PYTHON = $$(PYTHON) } } diff --git a/make/tools.mk b/make/tools.mk index ccf0da3bd..925751d0e 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -690,7 +690,11 @@ 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) - export PYTHON := python + ifeq ($(findstring Python 2,$(shell python --version)), Python 2) + export PYTHON := python + else + export PYTHON := python2 + endif endif .PHONY: python_version -- 2.11.4.GIT