Module Name: src
Committed By: christos
Date: Sun May 7 16:24:28 UTC 2023
Modified Files:
src/crypto: Makefile.openssl
Log Message:
Adjust for 3.x
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/Makefile.openssl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/Makefile.openssl
diff -u src/crypto/Makefile.openssl:1.12 src/crypto/Makefile.openssl:1.13
--- src/crypto/Makefile.openssl:1.12 Sat Mar 21 20:54:03 2020
+++ src/crypto/Makefile.openssl Sun May 7 12:24:28 2023
@@ -1,12 +1,25 @@
-# $NetBSD: Makefile.openssl,v 1.12 2020/03/22 00:54:03 christos Exp $
+# $NetBSD: Makefile.openssl,v 1.13 2023/05/07 16:24:28 christos Exp $
.ifndef _MAKEFILE_OPENSSL_INCLUDED
_MAKEFILE_OPENSSL_INCLUDED=1
.include <bsd.own.mk>
+.if ${HAVE_OPENSSL} <= 11
+OSSL_ENGINESDIR=/usr/lib/openssl
+.else
+. if defined(MLIBDIR)
+OSSL_LIBDIR=/usr/lib/${MLIBDIR}/openssl
+. else
+OSSL_LIBDIR=/usr/lib/openssl
+. endif
+OSSL_ENGINESDIR=${OSSL_LIBDIR}/engines
+OSSL_MODULESDIR=${OSSL_LIBDIR}/modules
+.endif
+
OPENSSLSRC= ${CRYPTODIST}/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/dist
CPPFLAGS+= -DOPENSSLDIR=\"/etc/openssl\"
-CPPFLAGS+= -DENGINESDIR=\"/usr/lib/openssl\"
+CPPFLAGS+= -DENGINESDIR=\"${OSSL_ENGINESDIR}\"
+CPPFLAGS+= -DMODULESDIR=\"${OSSL_MODULESDIR}\"
.endif
