Added new bsd.incs.mk which handles installing of header files

via INCS.  Implemented INCSLINKS (equivalent to SYMLINKS) to
handle symlinking include files.  Allow for multiple groups of
include files to be installed, with the powerful INCSGROUPS knob.
Documentation to follow.

Added standard `includes' and `incsinstall' targets, use them
in Makefile.inc1.  Headers from the following makefiles were
not installed before (during `includes' in Makefile.inc1):

	kerberos5/lib/libtelnet/Makefile
	lib/libbz2/Makefile
	lib/libdevinfo/Makefile
	lib/libform/Makefile
	lib/libisc/Makefile
	lib/libmenu/Makefile
	lib/libmilter/Makefile
	lib/libpanel/Makefile

Replaced all `beforeinstall' targets for installing includes
with the INCS stuff.

Renamed INCDIR to INCSDIR, for consistency with FILES and SCRIPTS,
and for compatibility with NetBSD.  Similarly for INCOWN, INCGRP,
and INCMODE.

Consistently use INCLUDEDIR instead of /usr/include.

gnu/lib/libstdc++/Makefile and gnu/lib/libsupc++/Makefile changes
were only lightly tested due to the missing contrib/libstdc++-v3.
I fully tested the pre-WIP_GCC31 version of this patch with the
contrib/libstdc++.295 stuff.

These changes have been tested on i386 with the -DNO_WERROR "make
world" and "make release".

5 files changed, 29 insertions, 42 deletions

diff --git a/include/Makefile b/include/Makefile
index c8ba2b6..3dc44de 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 0000000..2e6086b
--- /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 0000000..3c79142
--- /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 1d15974..a7a40a2 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 48e78a6..d7d093f 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}