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 913b90901..17a22ca77 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