Remove the need for ${FIND} in the top-level make.

3 files changed, 44 insertions, 20 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 2c38de614f2..15f28b2c478 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.186 2005/04/30 15:07:57 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.187 2005/05/02 05:16:21 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -273,7 +273,7 @@ USE_TOOLS+=	[ awk dirname echo grep pwd sed test true
 # These tools are used by the top-level make only in certain packages and
 # should eventually be moved into those particular package Makefiles.
 #
-USE_TOOLS+=	date find tr
+USE_TOOLS+=	date tr
 
 _USE_NEW_TOOLS?=	no
 .if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
diff --git a/regress/buildlink-transform/Makefile b/regress/buildlink-transform/Makefile
index c816c2eb24b..f5b324efe60 100644
--- a/regress/buildlink-transform/Makefile
+++ b/regress/buildlink-transform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/05/02 05:09:16 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/02 05:16:21 jlam Exp $
 #
 # Run many buildlink transform tests in a single regression test to avoid
 # having to keep creating the wrapper scripts over and over again.
@@ -96,15 +96,41 @@ TEST_DIR=	${.CURDIR}/tests
 # If RUNTESTS is defined, then just run those tests, otherwise run them all.
 .if defined(RUNTESTS)
 TEST_MAKEFILES=	${RUNTESTS:S/^/${TEST_DIR}\//:S/$/.mk/}
+.  for _mkfile_ in ${TEST_MAKEFILES}
+.    if exists(${_mkfile_})
+.      include "${_mkfile_}"
+.    endif
+.  endfor
 .else
-TEST_MAKEFILES!= \
-	${FIND} ${TEST_DIR} -name "*.mk" -print || ${ECHO} "none"
+.  include "tests/include-pkgdir-slashdot.mk"
+.  include "tests/include-pkgdir.mk"
+.  include "tests/include-pkgsubdir.mk"
+.  include "tests/include-usr-include-slashdot.mk"
+.  include "tests/include-usr-include-subdir.mk"
+.  include "tests/include-usr-include.mk"
+.  include "tests/lib-expand.mk"
+.  include "tests/libdir-pkgdir-slashdot.mk"
+.  include "tests/libdir-pkgdir.mk"
+.  include "tests/libdir-pkgsubdir.mk"
+.  include "tests/libdir-usr-lib-slashdot.mk"
+.  include "tests/libdir-usr-lib-subdir.mk"
+.  include "tests/libdir-usr-lib.mk"
+.  include "tests/libpath.mk"
+.  include "tests/libpath-in-define.mk"
+.  include "tests/no-abspath.mk"
+.  include "tests/preserve-option.mk"
+.  include "tests/quoted-arg.mk"
+.  include "tests/remove-dir.mk"
+.  include "tests/remove-option.mk"
+.  include "tests/repeated-arg.mk"
+.  include "tests/rpath-pkgdir-slashdot.mk"
+.  include "tests/rpath-pkgdir.mk"
+.  include "tests/rpath-pkgsubdir.mk"
+.  include "tests/rpath-usr-lib-slashdot.mk"
+.  include "tests/rpath-usr-lib-subdir.mk"
+.  include "tests/rpath-usr-lib.mk"
+.  include "tests/libpath-shlib.mk"
+.  include "tests/libpath-shmod.mk"
 .endif
 
-.for _mkfile_ in ${TEST_MAKEFILES}
-.  if exists(${_mkfile_})
-.    include "${_mkfile_}"
-.  endif
-.endfor
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/regress/buildlink-unwrap/Makefile b/regress/buildlink-unwrap/Makefile
index 284d75e5fad..bb9cf44bf55 100644
--- a/regress/buildlink-unwrap/Makefile
+++ b/regress/buildlink-unwrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/02 05:16:21 jlam Exp $
 
 DISTNAME=	regress-buildlink-unwrap-0.0
 CATEGORIES=	regress
@@ -87,15 +87,13 @@ TEST_DIR=	${.CURDIR}/tests
 # If RUNTESTS is defined, then just run those tests, otherwise run them all.
 .if defined(RUNTESTS)
 TEST_MAKEFILES=	${RUNTESTS:S/^/${TEST_DIR}\//:S/$/.mk/}
+.  for _mkfile_ in ${TEST_MAKEFILES}
+.    if exists(${_mkfile_})
+.      include "${_mkfile_}"
+.    endif
+.  endfor
 .else
-TEST_MAKEFILES!= \
-	${FIND} ${TEST_DIR} -name "*.mk" -print || ${ECHO} "none"
+.  include "tests/unwrap-config.mk"
 .endif
 
-.for _mkfile_ in ${TEST_MAKEFILES}
-.  if exists(${_mkfile_})
-.    include "${_mkfile_}"
-.  endif
-.endfor
-
 .include "../../mk/bsd.pkg.mk"