7 files changed, 29 insertions, 29 deletions

diff --git a/gnu/usr.bin/perl/Makefile b/gnu/usr.bin/perl/Makefile
index 3cce3ab02e1bd..6a12e59f07ad1 100644
--- a/gnu/usr.bin/perl/Makefile
+++ b/gnu/usr.bin/perl/Makefile
@@ -4,8 +4,4 @@ SUBDIR= libperl miniperl perl suidperl library pod utils x2p
 
 MAINTAINER=markm@freebsd.org
 
-build-tools:
-	cd ${.CURDIR}/libperl && make build-tools
-	cd ${.CURDIR}/miniperl && make build-tools
-
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/perl/Makefile.inc b/gnu/usr.bin/perl/Makefile.inc
index 5484c1ad587b8..8307107c79cd1 100644
--- a/gnu/usr.bin/perl/Makefile.inc
+++ b/gnu/usr.bin/perl/Makefile.inc
@@ -2,7 +2,12 @@
 
 PERL5SRC?= ${.CURDIR}/../../../../contrib/perl5
 PERL5LIBSRC?= ${.CURDIR}/../libperl
+
+.if exists(${.OBJDIR}/../miniperl/miniperl)
 MINIPERL?=	${.OBJDIR}/../miniperl/miniperl
+.else
+MINIPERL?=	${.OBJDIR}/../../miniperl/miniperl
+.endif
 
 BINDIR?=	/usr/bin
 
diff --git a/gnu/usr.bin/perl/libperl/Makefile b/gnu/usr.bin/perl/libperl/Makefile
index dd85aed2ece37..f0620fb2ab9d3 100644
--- a/gnu/usr.bin/perl/libperl/Makefile
+++ b/gnu/usr.bin/perl/libperl/Makefile
@@ -20,9 +20,6 @@ NO_PERL_SCRIPT_MAKE=	true
 
 .include <bsd.lib.mk>
 
-build-tools:	cleandepend
-	cd ${.CURDIR} && ${MAKE} lib${LIB}.a
-
 config.h:	links
 	@sh config_h.sh
 
diff --git a/gnu/usr.bin/perl/library/Makefile.inc b/gnu/usr.bin/perl/library/Makefile.inc
index 5246a5b9f50ca..31f6fd2a3d82e 100644
--- a/gnu/usr.bin/perl/library/Makefile.inc
+++ b/gnu/usr.bin/perl/library/Makefile.inc
@@ -2,7 +2,6 @@
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC?=	${.CURDIR}/../../libperl
-MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 MODULEDIR?=	${MODULE}
 
diff --git a/gnu/usr.bin/perl/miniperl/Makefile b/gnu/usr.bin/perl/miniperl/Makefile
index 394a116719b10..3f40945d576d5 100644
--- a/gnu/usr.bin/perl/miniperl/Makefile
+++ b/gnu/usr.bin/perl/miniperl/Makefile
@@ -1,25 +1,31 @@
-#
 # $FreeBSD$
-#
 
 PROG=	miniperl
 NOMAN=	true
-CFLAGS+=-I${PERL5SRC} -I${.OBJDIR}
-SRCS=	miniperlmain.c opmini.c config.h
+SRCS=	miniperlmain.c
+SRCS+=	perl.c gv.c toke.c perly.c op.c regcomp.c dump.c util.c mg.c \
+	hv.c av.c run.c pp_hot.c sv.c pp.c scope.c pp_ctl.c pp_sys.c \
+	doop.c doio.c regexec.c taint.c universal.c \
+	globals.c perlio.c config.h
+CFLAGS+=-I${.OBJDIR} -I${PERL5SRC}
+DPADD=	${LIBM} ${LIBCRYPT}
+LDADD=	-lm -lcrypt
+
+# In FreeBSD 4.0, setproctitle(3) is in -lutil.
+.if defined(BOOTSTRAPPING)
+DPADD+=	${LIBUTIL}
+LDADD+=	-lutil
+.endif
+
 # Miniperl _must_ be static!!
 NOSHARED= yes
-.if exists(${.OBJDIR}/../libperl/)
-MYLIBPERL= ${.OBJDIR}/../libperl/libperl.a
-.else
-MYLIBPERL= ${.CURDIR}/../libperl/libperl.a
-.endif
-DPADD=	${MYLIBPERL} ${LIBM} ${LIBCRYPT} ${LIBUTIL}
-LDADD=	${MYLIBPERL} -lm -lcrypt -lutil
 
-build-tools:	cleandepend
-	cd ${.CURDIR} && ${MAKE} ${PROG}
+# We need miniperl early in `depend'.
+afterdepend: all
 
-install distribute:
+build-tools: depend all
+
+install:
 
 NO_PERL_SCRIPT_MAKE=	true
 
@@ -27,10 +33,9 @@ NO_PERL_SCRIPT_MAKE=	true
 
 .PATH:	${PERL5SRC}
 
-opmini.c:	op.c
-	ln -sf ${.OODATE} ${.TARGET}
-
-config.h:	links
+config.h: links
 	@sh config_h.sh
 
-CLEANFILES+=	opmini.c config.h
+.SUFFIXES:
+
+.SUFFIXES: .o .po .So .s .S .c
diff --git a/gnu/usr.bin/perl/pod/Makefile.inc b/gnu/usr.bin/perl/pod/Makefile.inc
index e4440c74a553a..1e3cbfe7fc72f 100644
--- a/gnu/usr.bin/perl/pod/Makefile.inc
+++ b/gnu/usr.bin/perl/pod/Makefile.inc
@@ -4,7 +4,6 @@
 
 PERL5SRC?=	${.CURDIR}/../../../../../contrib/perl5
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 CLEANFILES+=	${PROG}.1 ${PROG}.PL
 
diff --git a/gnu/usr.bin/perl/x2p/Makefile.inc b/gnu/usr.bin/perl/x2p/Makefile.inc
index 96536145dbb76..7f8371ceb29f4 100644
--- a/gnu/usr.bin/perl/x2p/Makefile.inc
+++ b/gnu/usr.bin/perl/x2p/Makefile.inc
@@ -5,7 +5,6 @@
 PERL5SRC=	${.CURDIR}/../../../../../contrib/perl5
 PERL5LIBSRC=	${.CURDIR}/../../libperl
 MINIPERLOPT?=	-I${.OBJDIR}/../../perl/lib -I${.OBJDIR}/../../perl
-MINIPERL=	${.OBJDIR}/../../miniperl/miniperl
 
 LDFLAGS+=	-L${.OBJDIR}/../../libperl