mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
OP-1160: fixes from review
This commit is contained in:
parent
eeec9db3b4
commit
98076fb194
2
Makefile
2
Makefile
@ -860,7 +860,7 @@ help:
|
|||||||
@$(ECHO) " Here is a summary of the available targets:"
|
@$(ECHO) " Here is a summary of the available targets:"
|
||||||
@$(ECHO)
|
@$(ECHO)
|
||||||
@$(ECHO) " [Source tree preparation]"
|
@$(ECHO) " [Source tree preparation]"
|
||||||
@$(ECHO) " prepare - Install GIT commit message templates"
|
@$(ECHO) " prepare - Install GIT commit message template"
|
||||||
@$(ECHO) " [Tool Installers]"
|
@$(ECHO) " [Tool Installers]"
|
||||||
@$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain"
|
@$(ECHO) " arm_sdk_install - Install the GNU ARM gcc toolchain"
|
||||||
@$(ECHO) " qt_sdk_install - Install the QT development tools"
|
@$(ECHO) " qt_sdk_install - Install the QT development tools"
|
||||||
|
@ -564,8 +564,8 @@ ifeq ($(UNAME), Windows)
|
|||||||
$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(notdir $(OPENSSL_URL))))
|
$(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(notdir $(OPENSSL_URL))))
|
||||||
|
|
||||||
ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists)
|
ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists)
|
||||||
export OPENSSL := "$(OPENSSL_DIR)/bin/openssl"
|
export OPENSSL := "$(OPENSSL_DIR)/bin/openssl"
|
||||||
export OPENSSL_DIR := "$(OPENSSL_DIR)"
|
export OPENSSL_DIR := "$(OPENSSL_DIR)"
|
||||||
else
|
else
|
||||||
# not installed, hope it's in the path...
|
# not installed, hope it's in the path...
|
||||||
# $(info $(EMPTY) WARNING $(call toprel, $(OPENSSL_DIR)) not found (make openssl_install), using system PATH)
|
# $(info $(EMPTY) WARNING $(call toprel, $(OPENSSL_DIR)) not found (make openssl_install), using system PATH)
|
||||||
|
Loading…
Reference in New Issue
Block a user