From 3e8de2e362bbf008f7e468dc4f6f1c6f15765fea Mon Sep 17 00:00:00 2001 From: James Duley Date: Sat, 23 Aug 2014 14:53:22 +1200 Subject: [PATCH] OP-1324 removed use of env variable in python.pri --- ground/openpilotgcs/src/python.pri | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/src/python.pri b/ground/openpilotgcs/src/python.pri index a101bfb75..4d80b1970 100644 --- a/ground/openpilotgcs/src/python.pri +++ b/ground/openpilotgcs/src/python.pri @@ -15,7 +15,12 @@ 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_VER = $$system(python --version 2>&1) + contains(PYTHON_VER, "Python 2") { + PYTHON = \"python\" + } else { + PYTHON = \"python2\" + } } }