3 files changed, 22 insertions, 3 deletions

diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index fd0fa55e5ecc6..eb3a8c9847e27 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -1,7 +1,24 @@
 # $FreeBSD$
 
-SUBDIR= libperl perl suidperl library pod utils x2p BSDPAN
+.ifmake !install && !distribute
+_MINI=	miniperl
+.endif
+
+SUBDIR= libperl ${_MINI} perl suidperl library pod utils x2p BSDPAN
 
 MAINTAINER=markm@freebsd.org
 
+.BEGIN:
+.ifmake depend || all
+	if [ \! -f ${.OBJDIR}/build-tools ] ; then \
+		${ECHO} TESTING TESTING TESTING ; \
+		cd ${.CURDIR}/libperl && ${MAKE} depend && ${MAKE} all ; \
+		cd ${.CURDIR}/miniperl && ${MAKE} depend && ${MAKE} all ; \
+		touch ${.OBJDIR}/build-tools ; \
+	fi
+.endif
+.ifmake cleandir || clean
+	@rm -f ${.OBJDIR}/build-tools
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index c4066bb0dd1fe..bd8b8891675dc 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -2,7 +2,10 @@
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 PERL5LIBSRC?= ${.CURDIR}/../libperl
-MINIPERL?=	miniperl
+MINIPERL!=	echo `PATH=$$PATH:${.OBJDIR}/../miniperl:${.OBJDIR}/../../miniperl which miniperl`
+
+test:
+	echo FOO FOO FOO ${MINIPERL}
 
 BINDIR?=	/usr/bin
 
diff --git a/gnu/usr.bin/perl/utils/Makefile.inc b/gnu/usr.bin/perl/utils/Makefile.inc
index 726602bdd170f..a82b1ce653454 100644
--- a/gnu/usr.bin/perl/utils/Makefile.inc
+++ b/gnu/usr.bin/perl/utils/Makefile.inc
@@ -4,7 +4,6 @@
 
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
-MINIPERL=	miniperl
 
 .include "../Makefile.inc"