5 files changed, 29 insertions, 42 deletions

diff --git a/include/Makefile b/include/Makefile
index c8ba2b6ef521..3dc44dec65df 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -7,8 +7,8 @@
 # links.
 
 CLEANFILES= osreldate.h version vers.c
-SUBDIR= rpcsvc rpc
-HDRS=	a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \
+SUBDIR= arpa protocols rpcsvc rpc
+INCS=	a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \
 	dirent.h \
 	dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \
 	fts.h glob.h grp.h \
@@ -23,10 +23,6 @@ HDRS=	a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \
 	string.h stringlist.h strings.h sysexits.h tar.h time.h timers.h \
 	ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h
 
-ARPAHDRS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
-
-PROTOHDRS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
-
 MHDRS=	float.h floatingpoint.h stdarg.h varargs.h
 
 # posix4/aio.h conflicts with dysons and isn't installed:
@@ -57,7 +53,7 @@ LSYMSUBDIRS=	${LSUBDIRS:Ncam/scsi:Nnetatm/*}
 #SHARED=	symlinks
 SHARED?=	copies
 
-all:	osreldate.h
+INCS+=	osreldate.h
 
 osreldate.h:	${.CURDIR}/../sys/conf/newvers.sh \
 		${.CURDIR}/../sys/sys/param.h \
@@ -73,28 +69,14 @@ osreldate.h:	${.CURDIR}/../sys/conf/newvers.sh \
 	echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h; \
 	echo "#endif" >> osreldate.h
 
-beforeinstall: ${SHARED}
-	@rm -f ${DESTDIR}/usr/include/timepps.h
-	cd ${.CURDIR}; \
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${HDRS} ${DESTDIR}/usr/include
-	cd ${.CURDIR}/arpa; \
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${ARPAHDRS} ${DESTDIR}/usr/include/arpa
-	cd ${.CURDIR}/protocols; \
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${PROTOHDRS} ${DESTDIR}/usr/include/protocols
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.OBJDIR}/osreldate.h \
-		${DESTDIR}/usr/include
 .for i in ${LHDRS}
-	ln -sf sys/$i ${DESTDIR}/usr/include/$i
+INCSLINKS+=	sys/$i ${INCLUDEDIR}/$i
 .endfor
 .for i in ${MHDRS}
-	ln -sf machine/$i ${DESTDIR}/usr/include/$i
+INCSLINKS+=	machine/$i ${INCLUDEDIR}/$i
 .endfor
 .for i in ${PHDRS}
-	ln -sf posix4/$i ${DESTDIR}/usr/include/$i
+INCSLINKS+=	posix4/$i ${INCLUDEDIR}/$i
 .endfor
 
 copies:
@@ -134,4 +116,6 @@ symlinks:
 	rm -rf ${DESTDIR}/usr/include/machine
 	ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
 
+_incsinstall: ${SHARED}
+
 .include <bsd.prog.mk>
diff --git a/include/arpa/Makefile b/include/arpa/Makefile
new file mode 100644
index 000000000000..2e6086bc4988
--- /dev/null
+++ b/include/arpa/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=	noobj
+INCS=	ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h
+INCSDIR=${INCLUDEDIR}/arpa
+
+.include <bsd.prog.mk>
diff --git a/include/protocols/Makefile b/include/protocols/Makefile
new file mode 100644
index 000000000000..3c79142557a6
--- /dev/null
+++ b/include/protocols/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+NOOBJ=	noobj
+INCS=	dumprestore.h routed.h rwhod.h talkd.h timed.h
+INCSDIR=${INCLUDEDIR}/protocols
+
+.include <bsd.prog.mk>
diff --git a/include/rpc/Makefile b/include/rpc/Makefile
index 1d159746eda4..a7a40a2251c0 100644
--- a/include/rpc/Makefile
+++ b/include/rpc/Makefile
@@ -22,14 +22,8 @@ HFILES+= auth_kerb.h
 
 CLEANFILES+= ${HDRS}
 
-all: ${HDRS}
-
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${HFILES:S;^;${.CURDIR}/;} \
-		${XFILES:S;^;${.CURDIR}/;} \
-		${HDRS} \
-		${DESTDIR}/usr/include/rpc
+INCS=	${HFILES} ${XFILES} ${HDRS}
+INCSDIR=${INCLUDEDIR}/rpc
 
 .x.h:
 	${RPCCOM} -h -DWANT_NFS3 ${.IMPSRC} -o ${.TARGET}
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index 48e78a6f4733..d7d093fe5eb7 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -17,16 +17,11 @@ HFILES= yp_prot.h ypclnt.h nis_db.h nis_tags.h nislib.h
 
 CLEANFILES+= ${HDRS}
 
-all: ${HDRS}
-
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${HFILES:S;^;${.CURDIR}/;} \
-		${XFILES:S;^;${.CURDIR}/;} \
-		${HDRS} \
-		${DESTDIR}/usr/include/rpcsvc
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 key_prot.h \
-		${DESTDIR}/usr/include/rpc
+INCSGROUPS=	INCS RPCHDRS
+INCS=		${HFILES} ${XFILES} ${HDRS}
+INCSDIR=	${INCLUDEDIR}/rpcsvc
+RPCHDRS=	key_prot.h
+RPCHDRSDIR=	${INCLUDEDIR}/rpc
 
 .x.h:
 	${RPCCOM} -h -DWANT_NFS3 ${.IMPSRC} -o ${.TARGET}