1 files changed, 33 insertions, 31 deletions
diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile
index f60d512dc09b..c4f43512623d 100644
--- a/lib/libc/tests/regex/Makefile
+++ b/lib/libc/tests/regex/Makefile
@@ -3,8 +3,6 @@
 .include <bsd.own.mk>
 
 PACKAGE=	tests
-FILESGROUPS=	TESTS
-TESTSPACKAGE=	${PACKAGE}
 
 BINDIR=		${TESTSDIR}
 
@@ -16,35 +14,39 @@ SRCS.h_regex=	main.c split.c debug.c
 
 NETBSD_ATF_TESTS_SH=	regex_test
 
-FILESDIR=	${TESTSDIR}/data
-FILES+=		README
-FILES+=		data/anchor.in
-FILES+=		data/backref.in
-FILES+=		data/basic.in
-FILES+=		data/bracket.in
-FILES+=		data/c_comments.in
-FILES+=		data/complex.in
-FILES+=		data/error.in
-FILES+=		data/meta.in
-FILES+=		data/nospec.in
-FILES+=		data/paren.in
-FILES+=		data/regress.in
-FILES+=		data/repet_bounded.in
-FILES+=		data/repet_multi.in
-FILES+=		data/repet_ordinary.in
-FILES+=		data/startend.in
-FILES+=		data/subexp.in
-FILES+=		data/subtle.in
-FILES+=		data/word_bound.in
-FILES+=		data/zero.in
-#FILES+=		data/att/README
-FILES+=		data/att/basic.dat
-FILES+=		data/att/categorization.dat
-FILES+=		data/att/forcedassoc.dat
-FILES+=		data/att/leftassoc.dat
-FILES+=		data/att/nullsubexpr.dat
-FILES+=		data/att/repetition.dat
-FILES+=		data/att/rightassoc.dat
+${PACKAGE}FILES+=		README
+
+FILESGROUPS+=	${PACKAGE}DATA_FILES
+${PACKAGE}DATA_FILESPACKAGE=${PACKAGE}
+
+${PACKAGE}DATA_FILESDIR=	${TESTSDIR}/data
+${PACKAGE}DATA_FILES+=		data/anchor.in
+${PACKAGE}DATA_FILES+=		data/backref.in
+${PACKAGE}DATA_FILES+=		data/basic.in
+${PACKAGE}DATA_FILES+=		data/bracket.in
+${PACKAGE}DATA_FILES+=		data/c_comments.in
+${PACKAGE}DATA_FILES+=		data/complex.in
+${PACKAGE}DATA_FILES+=		data/error.in
+${PACKAGE}DATA_FILES+=		data/meta.in
+${PACKAGE}DATA_FILES+=		data/nospec.in
+${PACKAGE}DATA_FILES+=		data/paren.in
+${PACKAGE}DATA_FILES+=		data/regress.in
+${PACKAGE}DATA_FILES+=		data/repet_bounded.in
+${PACKAGE}DATA_FILES+=		data/repet_multi.in
+${PACKAGE}DATA_FILES+=		data/repet_ordinary.in
+${PACKAGE}DATA_FILES+=		data/startend.in
+${PACKAGE}DATA_FILES+=		data/subexp.in
+${PACKAGE}DATA_FILES+=		data/subtle.in
+${PACKAGE}DATA_FILES+=		data/word_bound.in
+${PACKAGE}DATA_FILES+=		data/zero.in
+#${PACKAGE}DATA_FILES+=		data/att/README
+${PACKAGE}DATA_FILES+=		data/att/basic.dat
+${PACKAGE}DATA_FILES+=		data/att/categorization.dat
+${PACKAGE}DATA_FILES+=		data/att/forcedassoc.dat
+${PACKAGE}DATA_FILES+=		data/att/leftassoc.dat
+${PACKAGE}DATA_FILES+=		data/att/nullsubexpr.dat
+${PACKAGE}DATA_FILES+=		data/att/repetition.dat
+${PACKAGE}DATA_FILES+=		data/att/rightassoc.dat
 
 NETBSD_ATF_TESTS_C=	exhaust_test
 NETBSD_ATF_TESTS_C+=	regex_att_test