Test must build also when started with make regress. Use consistent

variable names in make file.

diff --git a/regress/libexec/ld.so/nodelete/liba/Makefile b/regress/libexec/ld.so/nodelete/liba/Makefile
index ae82bfa..e92abaf 100644 (file)
--- 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 fc0b6a9..0f7b8b1 100644 (file)
--- 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 602187a..6ed965a 100644 (file)
--- 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       \