Module Name: src
Committed By: martin
Date: Thu Jun 20 18:18:44 UTC 2024
Modified Files:
src/crypto/external/bsd/openssh/bin [netbsd-10]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by rin in ticket #709):
crypto/external/bsd/openssh/bin/Makefile.inc: revision 1.5
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.3.26.1 -r1.3.26.2 \
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.3.26.1 src/crypto/external/bsd/openssh/bin/Makefile.inc:1.3.26.2
--- src/crypto/external/bsd/openssh/bin/Makefile.inc:1.3.26.1 Mon Dec 25 12:22:55 2023
+++ src/crypto/external/bsd/openssh/bin/Makefile.inc Thu Jun 20 18:18:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3.26.1 2023/12/25 12:22:55 martin Exp $
+# $NetBSD: Makefile.inc,v 1.3.26.2 2024/06/20 18:18:44 martin 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
