Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/crypto/libcrypto include the right test directory for ...



details:   https://anonhg.NetBSD.org/src/rev/ae2fae285257
branches:  trunk
changeset: 829709:ae2fae285257
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 08 23:41:26 2018 +0000

description:
include the right test directory for the right openssl version

diffstat:

 tests/crypto/libcrypto/Makefile.inc |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (22 lines):

diff -r bc78a8ef458d -r ae2fae285257 tests/crypto/libcrypto/Makefile.inc
--- a/tests/crypto/libcrypto/Makefile.inc       Thu Feb 08 23:32:38 2018 +0000
+++ b/tests/crypto/libcrypto/Makefile.inc       Thu Feb 08 23:41:26 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2018/02/08 21:59:10 christos Exp $
+# $NetBSD: Makefile.inc,v 1.8 2018/02/08 23:41:26 christos Exp $
 
 .include <bsd.own.mk>
 .include "../Makefile.inc"
@@ -24,7 +24,11 @@
 CPPFLAGS+=     -I${OPENSSLSRC}/crypto/include
 CRYPTODIST=    ${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-.PATH: ${OPENSSLSRC}/test ${OPENSSLSRC}/crypto/${HELPER_DIR}
+.if ${HAVE_OPENSSL} != 10
+.PATH: ${OPENSSLSRC}/test
+.else
+.PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
+.endif
 
 .include <bsd.test.mk>
 .include <bsd.prog.mk>



Home | Main Index | Thread Index | Old Index