Module Name: src Committed By: rin Date: Wed Jun 5 10:50:37 UTC 2024
Modified Files: src/crypto/external/bsd/openssh/bin: Makefile.inc Log Message: openssh/bin: Use ${EXTERNAL_OPENSSL_SUBDIR} instead of `openssl` NFC at the moment; for consistency in the future, when we use `openssl.old` again. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/bin/Makefile.inc diff -u src/crypto/external/bsd/openssh/bin/Makefile.inc:1.4 src/crypto/external/bsd/openssh/bin/Makefile.inc:1.5 --- src/crypto/external/bsd/openssh/bin/Makefile.inc:1.4 Wed Dec 20 17:15:20 2023 +++ src/crypto/external/bsd/openssh/bin/Makefile.inc Wed Jun 5 10:50:37 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2023/12/20 17:15:20 christos Exp $ +# $NetBSD: Makefile.inc,v 1.5 2024/06/05 10:50:37 rin Exp $ CPPFLAGS+=-DWITH_OPENSSL @@ -6,7 +6,7 @@ CRYPTOBSD=${NETBSDSRCDIR}/crypto/externa PROGDPLIBS+= \ ssh ${CRYPTOBSD}/openssh/lib \ - crypto ${CRYPTOBSD}/openssl/lib/libcrypto \ + crypto ${CRYPTOBSD}/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \ crypt ${NETBSDSRCDIR}/lib/libcrypt \ z ${NETBSDSRCDIR}/lib/libz