4 files changed, 23 insertions, 9 deletions

diff --git a/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile b/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile
new file mode 100644
index 000000000000..2d54a624fd7e
--- /dev/null
+++ b/gnu/usr.bin/perl/BSDPAN/BSDPAN/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=		noobj
+FILES=		Override.pm
+FILESDIR=	${BSDPANDIR}/BSDPAN
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile b/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile
new file mode 100644
index 000000000000..cd4dc8dc4f9f
--- /dev/null
+++ b/gnu/usr.bin/perl/BSDPAN/ExtUtils/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=		noobj
+FILES=		MM_Unix.pm Packlist.pm
+FILESDIR=	${BSDPANDIR}/ExtUtils
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/BSDPAN/Makefile b/gnu/usr.bin/perl/BSDPAN/Makefile
index 701712f07213..e2a5a893030b 100644
--- a/gnu/usr.bin/perl/BSDPAN/Makefile
+++ b/gnu/usr.bin/perl/BSDPAN/Makefile
@@ -2,17 +2,14 @@
 #
 # Doing a make install builds /usr/libdata/perl/BSDPAN
 
-DDIR=	${DESTDIR}/usr/libdata/perl/BSDPAN
+.include "Makefile.inc"
 
-NOOBJ=	noobj
+NOOBJ=		noobj
+FILES=		BSDPAN.pm Config.pm
+FILESDIR=	${BSDPANDIR}
 
-all clean cleandir depend lint tags:
+clean:
 
-FILES=	BSDPAN.pm BSDPAN/Override.pm Config.pm ExtUtils/MM_Unix.pm ExtUtils/Packlist.pm
-
-.for file in ${FILES}
-beforeinstall::
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${file} ${DDIR}/${file}
-.endfor
+SUBDIR=		BSDPAN ExtUtils
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/perl/BSDPAN/Makefile.inc b/gnu/usr.bin/perl/BSDPAN/Makefile.inc
new file mode 100644
index 000000000000..73c8341d55dd
--- /dev/null
+++ b/gnu/usr.bin/perl/BSDPAN/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+BSDPANDIR=	${LIBDATADIR}/perl/BSDPAN