rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

Merge branch 'next' into fw_wiz

Browse Source
This commit is contained in:
Fredrik Larson 2014-08-21 02:08:17 +10:00
commit 079e251cc4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/python.pri
View File

@ -15,7 +15,7 @@ OPENPILOT_TOOLS_DIR = $$(OPENPILOT_TOOLS_DIR)
PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\" PYTHON = \"$$ROOT_DIR/tools/$$PYTHON_DIR/python\"
} else { } else {
# not found, hope it's in the path... # not found, hope it's in the path...
PYTHON = \"python\" PYTHON = \"$$(PYTHON)\"
} }
} }

8
make/tools.mk
View File

@ -422,7 +422,7 @@ define LINUX_QT_INSTALL_TEMPLATE
qt_sdk_install: qt_sdk_clean | $(DL_DIR) $(TOOLS_DIR) qt_sdk_install: qt_sdk_clean | $(DL_DIR) $(TOOLS_DIR)
$(V1) if ! $(SEVENZIP) >/dev/null 2>&1; then \ $(V1) if ! $(SEVENZIP) >/dev/null 2>&1; then \
$(ECHO) $(MSG_NOTICE) "Please install the p7zip for your distribution. i.e.: sudo apt-get install p7zip." && \ $(ECHO) $(MSG_NOTICE) "Please install the p7zip for your distribution. i.e.: sudo apt-get install p7zip-full" && \
exit 1; \ exit 1; \
fi fi
$(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(4)") $(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(4)")
@ -690,7 +690,11 @@ ifeq ($(shell [ -d "$(PYTHON_DIR)" ] && $(ECHO) "exists"), exists)
else else
# not installed, hope it's in the path... # not installed, hope it's in the path...
# $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH) # $(info $(EMPTY) WARNING $(call toprel, $(PYTHON_DIR)) not found, using system PATH)
export PYTHON := python ifeq ($(findstring Python 2,$(shell python --version 2>&1)), Python 2)
export PYTHON := python
else
export PYTHON := python2
endif
endif endif
.PHONY: python_version .PHONY: python_version