rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

OP-1255 Win:Fixed 7z detection when it is not in path but under tools/bin

Browse Source 
Lin:Switch from 7zr to 7za due to wider availability
This commit is contained in:
Alessio Morale 2014-04-08 14:11:17 +02:00
parent 01ec5bcc31
commit 10a0f69c82
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
make/tools.mk
View File

@ -153,9 +153,13 @@ JAR := jar
CD := cd CD := cd
GREP := grep GREP := grep
ifneq ($(UNAME), Windows) ifneq ($(UNAME), Windows)
SEVENZIP := 7zr SEVENZIP := 7za
else else
SEVENZIP := 7za.exe SEVENZIP := 7za.exe
ifneq ($(shell $(SEVENZIP) --version >/dev/null 2>&1 && $(ECHO) "found"), found)
# no $(SEVENZIP) found in path. hope is in bin...
SEVENZIP = $(TOOLS_DIR)/bin/7za.exe
endif
endif endif
# 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.