3 files changed, 16 insertions, 30 deletions

diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile
index ead7950985ed..8cce7cd63702 100644
--- a/gnu/usr.bin/cvs/contrib/Makefile
+++ b/gnu/usr.bin/cvs/contrib/Makefile
@@ -2,7 +2,7 @@
 
 MAINTAINER=	peter@FreeBSD.org
 
-.include "${.CURDIR}/../Makefile.inc"
+.include "../Makefile.inc"
 
 .PATH:	${CVSDIR}/contrib
 .PATH:	${CVSDIR}/man
@@ -13,8 +13,9 @@ SCRIPTS= clmerge cln_hist commit_prep cvs2vendor cvs_acls cvscheck \
 
 FILES=	 README cvscheck.man cvshelp.man descend.man intro.doc
 
-EXAMPDIR=	/usr/share/examples/cvs
-SCRIPTSDIR=	${EXAMPDIR}/contrib
+EXAMPDIR=	${SHAREDIR}/examples/cvs
+FILESDIR=	${EXAMPDIR}/contrib
+SCRIPTSDIR=	${FILESDIR}
 PERLPATH=	/usr/bin/perl
 CLEANFILES+=	$(SCRIPTS)
 
@@ -29,12 +30,4 @@ CLEANFILES+=	$(SCRIPTS)
 .in:
 	sed -e 's,@CSH@,/bin/csh,' -e 's,@PERL@,$(PERLPATH),' $< > $@
 
-
-beforeinstall:
-.for file in ${FILES}
-	cd ${.CURDIR} ; \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
-		${CVSDIR}/contrib/${file} ${DESTDIR}${EXAMPDIR}/contrib
-.endfor
-
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile
index 1097122e64f0..314a3ae07024 100644
--- a/gnu/usr.bin/dialog/TESTS/Makefile
+++ b/gnu/usr.bin/dialog/TESTS/Makefile
@@ -1,12 +1,8 @@
 # $FreeBSD$
 
-FILES=	README checklist ftreebox infobox inputbox menubox msgbox \
-	prgbox radiolist textbox treebox yesno
-
-beforeinstall:
-.for file in ${FILES}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/${file} \
-		${DESTDIR}/usr/share/examples/dialog
-.endfor
+NOOBJ=		noobj
+FILES=		README checklist ftreebox infobox inputbox menubox msgbox \
+		prgbox radiolist textbox treebox yesno
+FILESDIR=	${SHAREDIR}/examples/dialog
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile
index 3df1245cbcb6..a6ed64e5dc59 100644
--- a/gnu/usr.bin/groff/contrib/mm/Makefile
+++ b/gnu/usr.bin/groff/contrib/mm/Makefile
@@ -3,12 +3,13 @@
 SCRIPTS=	mmroff.pl
 MAN=		mmroff.7
 
-TMACOWN?=	${BINOWN}
-TMACGRP?=	${BINGRP}
-TMACMODE?=	${NOBINMODE}
 TMACDIR?=	${SHAREDIR}/tmac
 
-FILES=		0.MT 5.MT 4.MT ms.cov se_ms.cov
+FILES=		m.tmac mse.tmac
+FILESDIR_m.tmac=${TMACDIR}
+FILESDIR_mse.tmac=${TMACDIR}
+FILES+=		0.MT 5.MT 4.MT ms.cov se_ms.cov
+FILESDIR=	${TMACDIR}/mm
 LOCALE=		locale se_locale
 
 MAN+=		groff_mm.7 groff_mmse.7
@@ -17,17 +18,13 @@ MLINKS=		groff_mm.7 mm.7 groff_mmse.7 mmse.7
 CLEANFILES+=	${MAN}
 
 beforeinstall:
-	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-		${DIST_DIR}/m.tmac ${DIST_DIR}/mse.tmac ${DESTDIR}${TMACDIR}
-.for file in ${FILES}
-	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
-		${DIST_DIR}/mm/${file} ${DESTDIR}${TMACDIR}/mm
-.endfor
 .for locale in ${LOCALE}
 .if !exists(${locale}) || empty(${locale})
-	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+	${INSTALL} -c -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \
 		/dev/null ${DESTDIR}${TMACDIR}/mm/${locale}
 .endif
 .endfor
 
 .include <bsd.prog.mk>
+
+.PATH: ${DIST_DIR}/mm