From de4cc48814c8adea6f52ec9a5621432705dc7a7e Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Fri, 14 Oct 2022 17:09:44 +0000 Subject: Revert kn's Makefile surgery. It no longer does what it was supposed to do and I'm still not clear what it was supposed to fix. --- regress/usr.sbin/rpki-client/Makefile | 9 ++++++++- regress/usr.sbin/rpki-client/openssl11/Makefile | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'regress/usr.sbin') diff --git a/regress/usr.sbin/rpki-client/Makefile b/regress/usr.sbin/rpki-client/Makefile index 59b61c7bf6d..54afb1963bf 100644 --- a/regress/usr.sbin/rpki-client/Makefile +++ b/regress/usr.sbin/rpki-client/Makefile @@ -1,6 +1,13 @@ -# $OpenBSD: Makefile,v 1.11 2021/11/08 23:06:49 kn Exp $ +# $OpenBSD: Makefile,v 1.12 2022/10/14 17:09:43 tb Exp $ SUBDIR += libressl +.if exists(/usr/local/bin/eopenssl11) SUBDIR += openssl11 +.else +.END: + @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1' + @echo SKIPPED +.endif .include +.include diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile index f9a0eae1ce2..c7215cd7e32 100644 --- a/regress/usr.sbin/rpki-client/openssl11/Makefile +++ b/regress/usr.sbin/rpki-client/openssl11/Makefile @@ -1,9 +1,3 @@ -.if ! exists(/usr/local/bin/eopenssl11) -regress: - @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1' - @echo SKIPPED -.endif - LDADD += -Wl,-rpath,/usr/local/lib/eopenssl11 -L/usr/local/lib/eopenssl11 CFLAGS += -I${.CURDIR}/ -I/usr/local/include/eopenssl11/ CFLAGS += -DLIBRESSL_INTERNAL -- cgit v1.2.3