From 6f4618c6c03ccd1d0f1b55dd8ff05af4a05abe78 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 29 Jun 2022 15:06:18 +0000
Subject: Use relative paths so beck can run regress in his git tree and have
the correct ssl_local.h etc be picked up.
---
src/regress/lib/libssl/bytestring/Makefile | 5 +++--
src/regress/lib/libssl/handshake/Makefile | 5 +++--
src/regress/lib/libssl/key_schedule/Makefile | 5 +++--
src/regress/lib/libssl/tlsext/Makefile | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/regress/lib/libssl/bytestring/Makefile b/src/regress/lib/libssl/bytestring/Makefile
index 162c81d255..91b3fea902 100644
--- a/src/regress/lib/libssl/bytestring/Makefile
+++ b/src/regress/lib/libssl/bytestring/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2016/11/04 17:51:54 guenther Exp $
+# $OpenBSD: Makefile,v 1.6 2022/06/29 15:06:18 tb Exp $
PROG= bytestringtest
LDADD= ${SSL_INT} -lcrypto
DPADD= ${LIBCRYPTO} ${LIBSSL}
WARNINGS= Yes
-CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl
+CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror
+CFLAGS+= -I${.CURDIR}/../../../../lib/libssl
.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/handshake/Makefile b/src/regress/lib/libssl/handshake/Makefile
index aa0f70bd3b..64bd5709a8 100644
--- a/src/regress/lib/libssl/handshake/Makefile
+++ b/src/regress/lib/libssl/handshake/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2020/12/17 00:51:11 bluhm Exp $
+# $OpenBSD: Makefile,v 1.9 2022/06/29 15:06:18 tb Exp $
PROGS += handshake_table
PROGS += valid_handshakes_terminate
@@ -10,7 +10,8 @@ REGRESS_TARGETS += run-$p
LDADD = ${SSL_INT} -lcrypto
DPADD = ${LIBCRYPTO} ${LIBSSL}
WARNINGS = Yes
-CFLAGS += -DLIBRESSL_INTERNAL -Wundef -Werror -I${BSDSRCDIR}/lib/libssl
+CFLAGS += -DLIBRESSL_INTERNAL -Wundef -Werror
+CFLAGS+= -I${.CURDIR}/../../../../lib/libssl
print: handshake_table
@./handshake_table -C
diff --git a/src/regress/lib/libssl/key_schedule/Makefile b/src/regress/lib/libssl/key_schedule/Makefile
index 24e12b7c36..a8f23a27c5 100644
--- a/src/regress/lib/libssl/key_schedule/Makefile
+++ b/src/regress/lib/libssl/key_schedule/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2018/11/07 19:43:12 beck Exp $
+# $OpenBSD: Makefile,v 1.2 2022/06/29 15:06:18 tb Exp $
PROG= key_schedule
LDADD= ${SSL_INT} -lcrypto
DPADD= ${LIBCRYPTO} ${LIBSSL}
WARNINGS= Yes
-CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl
+CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror
+CFLAGS+= -I${.CURDIR}/../../../../lib/libssl
.include <bsd.regress.mk>
diff --git a/src/regress/lib/libssl/tlsext/Makefile b/src/regress/lib/libssl/tlsext/Makefile
index 48b5bc1e25..9ff441697f 100644
--- a/src/regress/lib/libssl/tlsext/Makefile
+++ b/src/regress/lib/libssl/tlsext/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2017/07/16 18:18:10 jsing Exp $
+# $OpenBSD: Makefile,v 1.2 2022/06/29 15:06:18 tb Exp $
PROG= tlsexttest
LDADD= ${SSL_INT} -lcrypto
DPADD= ${LIBCRYPTO} ${LIBSSL}
WARNINGS= Yes
-CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror -I$(BSDSRCDIR)/lib/libssl
+CFLAGS+= -DLIBRESSL_INTERNAL -Wundef -Werror
+CFLAGS+= -I${.CURDIR}/../../../../lib/libssl
.include <bsd.regress.mk>
--
cgit v1.2.3-55-g6feb