FILES support for bsd.prog.mk. See bsd.README for details.

Stolen from:	NetBSD

6 files changed, 16 insertions, 49 deletions

diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile
index b0ac4d0..f97c6c9 100644
--- a/usr.sbin/named/Makefile
+++ b/usr.sbin/named/Makefile
@@ -32,19 +32,15 @@ HTMLS=	acl.html address_list.html comments.html config.html controls.html \
 	docdef.html example.html include.html index.html key.html \
 	logging.html master.html options.html server.html trusted-keys.html \
 	zone.html
-FILES=	DynamicUpdate FAQ.1of2 FAQ.2of2 style.txt
+MISCS=	DynamicUpdate FAQ.1of2 FAQ.2of2 style.txt
+FILES=	${HTMLS} ${MISCS}
+.PATH: ${BIND_DIR}/doc/html ${BIND_DIR}/doc/misc
 
-
-beforeinstall:
 .for file in ${HTMLS}
-	cd ${BIND_DIR}/doc/html ; \
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
-		${DESTDIR}${DOCDIR}/html
+FILESDIR_${file}=	${DOCDIR}/html
 .endfor
-.for file in ${FILES}
-	cd ${BIND_DIR}/doc/misc ; \
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \
-		${DESTDIR}${DOCDIR}/misc
+.for file in ${MISCS}
+FILESDIR_${file}=	${DOCDIR}/misc
 .endfor
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/Misc/Doc/Makefile b/usr.sbin/pcvt/Misc/Doc/Makefile
index fcd2a9c..a6d9660 100644
--- a/usr.sbin/pcvt/Misc/Doc/Makefile
+++ b/usr.sbin/pcvt/Misc/Doc/Makefile
@@ -1,17 +1,9 @@
 # $FreeBSD$
 
+NOOBJ=	noobj
 FILES=	Acknowledgements Bibliography CharGen \
 	Charsets EscapeSequences Keyboard.HP Keyboard.VT \
 	NotesAndHints
+FILESDIR=	${BINDIR}/Doc
 
-beforeinstall:
-	for file in ${FILES}; \
-	do \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${.CURDIR}/$$file ${DESTDIR}${BINDIR}/Doc/$$file ; \
-	done
-
-afterdistribute: beforeinstall
-
-.include "../Makefile.inc"
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile
index 60b506d..5e1aac5 100644
--- a/usr.sbin/pcvt/Misc/Etc/Makefile
+++ b/usr.sbin/pcvt/Misc/Etc/Makefile
@@ -1,13 +1,7 @@
 # $FreeBSD$
 
+NOOBJ=	noobj
 FILES=	Termcap Terminfo pcvt.el xmodmap-german pcvt.sh
-
-NOOBJ=
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILES} \
-	    ${DESTDIR}${BINDIR}/Etc
-
-afterdistribute: beforeinstall
+FILESDIR=	${BINDIR}/Etc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile
index a512eaa..6eff974 100644
--- a/usr.sbin/pcvt/Misc/Makefile
+++ b/usr.sbin/pcvt/Misc/Makefile
@@ -1,17 +1,8 @@
 # $FreeBSD$
 
-SUBDIR=	Doc Etc
-
+NOOBJ=	noobj
 FILES=	README.FIRST
-
-beforeinstall:
-	for file in ${FILES}; \
-	do \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${.CURDIR}/$$file ${DESTDIR}${BINDIR}/$$file ; \
-	done
-
-afterdistribute: beforeinstall
+SUBDIR=	Doc Etc
 
 .include "Makefile.inc"
-.include <bsd.subdir.mk>
+.include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc
index c7ce5f2..c7a2ebc 100644
--- a/usr.sbin/pcvt/Misc/Makefile.inc
+++ b/usr.sbin/pcvt/Misc/Makefile.inc
@@ -1,5 +1,4 @@
 # $FreeBSD$
 
 DISTRIBUTION=	doc
-BINDIR=		/usr/share/pcvt
-BINMODE=	0444
+BINDIR=		${SHAREDIR}/pcvt
diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile
index 759962a..febb8e2 100644
--- a/usr.sbin/stallion/bootcode/Makefile
+++ b/usr.sbin/stallion/bootcode/Makefile
@@ -6,16 +6,11 @@
 	uudecode ${.IMPSRC}
 
 FILES=	2681.sys cdk.sys
+FILESDIR=	${BOOTDIR}
 CLEANFILES= 	${FILES}
 
 MAN=	stl.4
 MLINKS=	stl.4 stli.4
 MANSUBDIR=/i386
 
-all: $(FILES)
-
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${FILES} ${DESTDIR}${BOOTDIR}
-
 .include <bsd.prog.mk>