rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-1254 Check if p7zip is installed, use 7zr rather than 7z

Browse Source
This commit is contained in:
Alessio Morale 2014-03-08 14:19:24 +01:00
parent 0dff941cbe
commit a600ed93dc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/tools.mk
View File

@ -145,7 +145,7 @@ OPENSSL := openssl
ANT := ant ANT := ant
JAVAC := javac JAVAC := javac
JAR := jar JAR := jar
SEVENZIP := 7z SEVENZIP := 7zr
CD := cd CD := cd
GREP := grep GREP := grep
# Echo in recipes is a bit tricky in a Windows Git Bash window in some cases. # Echo in recipes is a bit tricky in a Windows Git Bash window in some cases.
@ -317,7 +317,10 @@ define LINUX_QT_INSTALL_TEMPLATE
.PHONY: $(addprefix qt_sdk_, install clean distclean) .PHONY: $(addprefix qt_sdk_, install clean distclean)
qt_sdk_install: qt_sdk_clean | $(DL_DIR) $(TOOLS_DIR) qt_sdk_install: qt_sdk_clean | $(DL_DIR) $(TOOLS_DIR)
if ! $(SEVENZIP) >/dev/null 2>&1; then \
$(ECHO) $(MSG_NOTICE) "Please install the p7zip for your distribution. i.e.: sudo apt-get install p7zip." && \
exit 1; \
fi
$(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(4)") $(call DOWNLOAD_TEMPLATE,$(3),$(5),"$(4)")
# Explode .run file into install packages # Explode .run file into install packages
@$(ECHO) $(MSG_EXTRACTING) $$(call toprel, $(1)) @$(ECHO) $(MSG_EXTRACTING) $$(call toprel, $(1))