From: Viktor Szakats <commit@vsz.me>
Date: Tue, 27 Dec 2022 11:36:03 +0000 (+0000)
Subject: Makefile.mk: fix wolfssl and mbedtls default paths
X-Git-Tag: curl-7_88_0~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=692c73707ab842f4282fdd6b52e83b0b7ca0d999;p=thirdparty%2Fcurl.git

Makefile.mk: fix wolfssl and mbedtls default paths

Fix the defaults for `WOLFSSL_PATH` and `MBEDTLS_PATH` to have
meaningful values instead of the copy-pasted wrong ones.

Ref: https://github.com/curl/curl/commit/66e68ca47f7fd00dff2cb7c45ba6725d40099585#r94275172

Reported-by: Ryan Schmidt
Closes #10164
---

diff --git a/lib/Makefile.mk b/lib/Makefile.mk
index 56917e0201..0854edfa7e 100644
--- a/lib/Makefile.mk
+++ b/lib/Makefile.mk
@@ -198,7 +198,7 @@ ifneq ($(findstring -ssl,$(CFG)),)
   endif
   SSLLIBS += 1
 else ifneq ($(findstring -wolfssl,$(CFG)),)
-  WOLFSSL_PATH ?= $(PROOT)/../zlib
+  WOLFSSL_PATH ?= $(PROOT)/../wolfssl
   CPPFLAGS += -DUSE_WOLFSSL
   CPPFLAGS += -DSIZEOF_LONG_LONG=8
   CPPFLAGS += -I"$(WOLFSSL_PATH)/include"
@@ -208,7 +208,7 @@ else ifneq ($(findstring -wolfssl,$(CFG)),)
   SSLLIBS += 1
 endif
 ifneq ($(findstring -mbedtls,$(CFG)),)
-  MBEDTLS_PATH ?= $(PROOT)/../zlib
+  MBEDTLS_PATH ?= $(PROOT)/../mbedtls
   CPPFLAGS += -DUSE_MBEDTLS
   CPPFLAGS += -I"$(MBEDTLS_PATH)/include"
   _LDFLAGS += -L"$(MBEDTLS_PATH)/lib"