diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2021-06-06 22:53:07 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2021-06-06 22:53:07 +0000 |
| commit | ade32329c738efec582d91dc129d77769615938f (patch) | |
| tree | 36a36009971ed437b1d06fbe2729d480e990ae90 /regress/libexec/ld.so | |
| parent | 7e525cc886d55c35c56e2502090a1023a2af4783 (diff) | |
Test must build also when started with make regress. Use consistent
variable names in make file.
Diffstat (limited to 'regress/libexec/ld.so')
| -rw-r--r-- | regress/libexec/ld.so/nodelete/liba/Makefile | 4 | ||||
| -rw-r--r-- | regress/libexec/ld.so/nodelete/test1/Makefile | 14 | ||||
| -rw-r--r-- | regress/libexec/ld.so/randomdata/Makefile.inc | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/regress/libexec/ld.so/nodelete/liba/Makefile b/regress/libexec/ld.so/nodelete/liba/Makefile index ae82bfad5e9..e92abaf56e7 100644 --- a/regress/libexec/ld.so/nodelete/liba/Makefile +++ b/regress/libexec/ld.so/nodelete/liba/Makefile @@ -1,7 +1,9 @@ -# $OpenBSD: Makefile,v 1.1 2021/06/02 07:32:34 semarie Exp $ +# $OpenBSD: Makefile,v 1.2 2021/06/06 22:53:06 bluhm Exp $ LIB = a SRCS = liba.c +regress: all + .include <bsd.lib.mk> diff --git a/regress/libexec/ld.so/nodelete/test1/Makefile b/regress/libexec/ld.so/nodelete/test1/Makefile index fc0b6a909bc..0f7b8b14863 100644 --- a/regress/libexec/ld.so/nodelete/test1/Makefile +++ b/regress/libexec/ld.so/nodelete/test1/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.2 2021/06/04 10:01:49 semarie Exp $ +# $OpenBSD: Makefile,v 1.3 2021/06/06 22:53:06 bluhm Exp $ .include <bsd.obj.mk> PROG = test1 -ADIR != if test -d ${.CURDIR}/../liba/${__objdir}; then \ - echo "${.CURDIR}/../liba/${__objdir}"; \ - else \ - echo "${.CURDIR}/../liba"; \ - fi +LIBADIR != if test -d ${.CURDIR}/../liba/${__objdir}; then \ + echo "${.CURDIR}/../liba/${__objdir}"; \ + else \ + echo "${.CURDIR}/../liba"; \ + fi -CFLAGS += -DLIBNAME=\"${ADIR}/liba.so.0.0\" +CFLAGS += -DLIBNAME=\"${LIBADIR}/liba.so.0.0\" .include <bsd.regress.mk> diff --git a/regress/libexec/ld.so/randomdata/Makefile.inc b/regress/libexec/ld.so/randomdata/Makefile.inc index 602187aad3d..6ed965aab93 100644 --- a/regress/libexec/ld.so/randomdata/Makefile.inc +++ b/regress/libexec/ld.so/randomdata/Makefile.inc @@ -1,3 +1,5 @@ +# $OpenBSD: Makefile.inc,v 1.2 2021/06/06 22:53:06 bluhm Exp $ + .include <bsd.obj.mk> LIBAADIR!= if test -d ${.CURDIR}/../libaa/${__objdir} ; then \ |