From 0423d4ce998b961192930d946c1e45f94e515180 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Tue, 14 Jan 2014 12:50:31 +0100 Subject: [PATCH] OP-1160 Copydata was pointing to OPENSSL instead of OPENSSL_DIR, added related export in tool.mk --- ground/openpilotgcs/copydata.pro | 2 +- make/tools.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ground/openpilotgcs/copydata.pro b/ground/openpilotgcs/copydata.pro index a0f25f204..26c808476 100644 --- a/ground/openpilotgcs/copydata.pro +++ b/ground/openpilotgcs/copydata.pro @@ -146,7 +146,7 @@ equals(copydata, 1) { ssleay32.dll \ libeay32.dll for(dll, OPENSSL_DLLS) { - data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() + data_copy.commands += $(COPY_FILE) $$targetPath(\"$$(OPENSSL_DIR)/$$dll\") $$targetPath(\"$$GCS_APP_PATH/$$dll\") $$addNewline() } data_copy.target = FORCE diff --git a/make/tools.mk b/make/tools.mk index 1f356c21b..add4a46a3 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -565,6 +565,7 @@ $(eval $(call TOOL_INSTALL_TEMPLATE,openssl,$(OPENSSL_DIR),$(OPENSSL_URL),$(notd ifeq ($(shell [ -d "$(OPENSSL_DIR)" ] && $(ECHO) "exists"), exists) export OPENSSL := "$(OPENSSL_DIR)/bin/openssl" + export OPENSSL_DIR := "$(OPENSSL_DIR)" else # not installed, hope it's in the path... # $(info $(EMPTY) WARNING $(call toprel, $(OPENSSL_DIR)) not found (make openssl_install), using system PATH)