1
0
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:
Alessio Morale 2014-01-15 11:19:35 +01:00
parent eeec9db3b4
commit 98076fb194
2 changed files with 3 additions and 3 deletions

View File

@ -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"

View File

@ -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)