From 4f66341ce717dbe402538a76449a2758dc615525 Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Mon, 1 Jun 2020 18:58:09 +0000
Subject: [PATCH] Install 32-bit libcrypto engines in /usr/lib32/engines
 instead of /usr/lib32 and let 32-bit libcrypto search that location instead
 of /usr/lib/engines.

Reviewed by:	jkim
---
 etc/mtree/BSD.lib32.dist                  | 2 ++
 secure/lib/libcrypto/Makefile.inc         | 2 +-
 secure/lib/libcrypto/engines/Makefile.inc | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist
index d1288462b15a..ce7d4bdc07fb 100644
--- a/etc/mtree/BSD.lib32.dist
+++ b/etc/mtree/BSD.lib32.dist
@@ -8,6 +8,8 @@
     lib32
         dtrace
         ..
+        engines
+        ..
         geom
         ..
         i18n
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index e33f59681a83..139dbb69a0ae 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -75,7 +75,7 @@ CFLAGS+=	-DPOLY1305_ASM
 
 .if defined(LIB)
 CFLAGS+=	-DOPENSSLDIR="\"/etc/ssl\""
-CFLAGS+=	-DENGINESDIR="\"/usr/lib/engines\""
+CFLAGS+=	-DENGINESDIR="\"${LIBDIR}/engines\""
 .endif
 
 CFLAGS+=	-DNDEBUG
diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc
index fd9e9f9bcc9f..1d368ae5d650 100644
--- a/secure/lib/libcrypto/engines/Makefile.inc
+++ b/secure/lib/libcrypto/engines/Makefile.inc
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?= /usr/lib/engines
+SHLIBDIR=	${LIBDIR}/engines
 
 LCRYPTO_SRC=	${SRCTOP}/crypto/openssl
 
-- 
2.41.0