From: tb <tb@openbsd.org>
Date: Fri, 14 Oct 2022 17:09:43 +0000 (+0000)
Subject: Revert kn's Makefile surgery. It no longer does what it was supposed
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f89b248866aeeba1113895b434e5ffc6b280e8b3;p=openbsd

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.
---

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 <bsd.subdir.mk>
+.include <bsd.regress.mk>
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