From 37f142940073694456d7826d759b19f8d58ea4eb Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Wed, 14 Mar 2018 16:05:51 +0100
Subject: [PATCH] Yet another fix of the unix static Makefile (#793)

---
 doc/deps-build/unix-static/Makefile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/deps-build/unix-static/Makefile b/doc/deps-build/unix-static/Makefile
index 71e46320b..21740bc53 100644
--- a/doc/deps-build/unix-static/Makefile
+++ b/doc/deps-build/unix-static/Makefile
@@ -67,13 +67,17 @@ $(TBB).tar.gz:
 	curl -L -o $@ https://github.com/wjakob/tbb/archive/$(TBB_SHA).tar.gz
 
 
+# Note: libcurl build system seems to be a bit wonky about finding openssl (cf. #2378).
+# It seems that currently the only working option is to set a prefix in the openssl build
+# and use the `--with-ssl=...` option in libcurl.
+# Additionally, pkg-config needs to be installed and openssl libs need to NOT be installed on the build system.
 
 libopenssl: $(OPENSSL).tar.gz
 	tar -zxvf $(OPENSSL).tar.gz
-	cd $(OPENSSL) && ./config --openssldir=/etc/ssl shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack'
-	make -C $(OPENSSL) depend
-	make -C $(OPENSSL) -j$(NPROC)
-	make -C $(OPENSSL) install DESTDIR=$(DESTDIR)
+	cd $(OPENSSL) && ./config --prefix=$(DESTDIR)/usr/local no-shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack'
+	$(MAKE) -C $(OPENSSL) depend
+	$(MAKE) -C $(OPENSSL) -j$(NPROC)
+	$(MAKE) -C $(OPENSSL) install_sw
 
 $(OPENSSL).tar.gz:
 	curl -L -o $@ 'https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz'
@@ -82,10 +86,9 @@ $(OPENSSL).tar.gz:
 
 libcurl: libopenssl $(CURL).tar.gz
 	tar -zxvf $(CURL).tar.gz
-#	Note: It seems setting custom openssl path doesn't work when pkg-config and system openssl devel libs are installed
 	cd $(CURL) && ./configure \
 		--enable-static \
-		--enable-shared \
+		--disable-shared \
 		--with-ssl=$(DESTDIR)/usr/local \
 		--with-pic \
 		--enable-ipv6 \