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".

1 files changed, 21 insertions, 107 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1e7fd4d..beb2fdc 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -234,8 +234,8 @@ USRDIRS=	usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \
 		usr/share/groff_font/devutf8 \
 		usr/share/tmac/mdoc usr/share/tmac/mm
 
-INCDIRS=	arpa dev fs g++/std isc isofs objc protocols \
-		readline rpc rpcsvc openssl security ufs
+INCDIRS=	arpa dev fs g++/std isc isofs libmilter objc openssl \
+		protocols readline rpc rpcsvc security ufs
 
 #
 # buildworld
@@ -299,7 +299,7 @@ _includes:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4: populating ${WORLDTMP}/usr/include"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes
+	cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes incsinstall
 _libraries:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -537,13 +537,9 @@ most:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Building programs only"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/bin;		${MAKE} all
-	cd ${.CURDIR}/sbin;		${MAKE} all
-	cd ${.CURDIR}/libexec;		${MAKE} all
-	cd ${.CURDIR}/usr.bin;		${MAKE} all
-	cd ${.CURDIR}/usr.sbin;		${MAKE} all
-	cd ${.CURDIR}/gnu/usr.bin;	${MAKE} all
-	cd ${.CURDIR}/gnu/usr.sbin;	${MAKE} all
+.for _dir in bin sbin libexec usr.bin usr.sbin gnu/usr.bin gnu/usr.sbin
+	cd ${.CURDIR}/${_dir};		${MAKE} DIRPRFX=${_dir}/ all
+.endfor
 
 #
 # installmost
@@ -555,13 +551,9 @@ installmost:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Installing programs only"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}/bin;		${MAKE} install
-	cd ${.CURDIR}/sbin;		${MAKE} install
-	cd ${.CURDIR}/libexec;		${MAKE} install
-	cd ${.CURDIR}/usr.bin;		${MAKE} install
-	cd ${.CURDIR}/usr.sbin;		${MAKE} install
-	cd ${.CURDIR}/gnu/usr.bin;	${MAKE} install
-	cd ${.CURDIR}/gnu/usr.sbin;	${MAKE} install
+.for _dir in bin sbin libexec usr.bin usr.sbin gnu/usr.bin gnu/usr.sbin
+	cd ${.CURDIR}/${_dir};		${MAKE} DIRPRFX=${_dir}/ install
+.endfor
 
 #
 # ------------------------------------------------------------------------
@@ -590,10 +582,10 @@ bootstrap-tools:
     usr.sbin/config usr.sbin/kbdcontrol \
     ${_cxx_consumers} gnu/usr.bin/texinfo
 	cd ${.CURDIR}/${_tool}; \
-		${MAKE} obj; \
-		${MAKE} depend; \
-		${MAKE} all; \
-		${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install
+		${MAKE} DIRPRFX=${_tool}/ obj; \
+		${MAKE} DIRPRFX=${_tool}/ depend; \
+		${MAKE} DIRPRFX=${_tool}/ all; \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
 #
@@ -630,7 +622,7 @@ build-tools:
 .for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \
     ${_perl} ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \
     usr.bin/awk usr.bin/file usr.sbin/sysinstall
-	cd ${.CURDIR}/${_tool}; ${MAKE} build-tools
+	cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools
 .endfor
 
 #
@@ -651,10 +643,10 @@ cross-tools:
     gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \
     gnu/usr.bin/cc ${_xlint}
 	cd ${.CURDIR}/${_tool}; \
-		${MAKE} obj; \
-		${MAKE} depend; \
-		${MAKE} all; \
-		${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install
+		${MAKE} DIRPRFX=${_tool}/ obj; \
+		${MAKE} DIRPRFX=${_tool}/ depend; \
+		${MAKE} DIRPRFX=${_tool}/ all; \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
 .endfor
 
 #
@@ -666,84 +658,6 @@ hierarchy:
 .if ${CXX} == "c++"
 NO_CXX=	yes
 .endif
-#
-# includes - possibly generate and install the include files.
-#
-includes:
-	cd ${.CURDIR}/include;			${MAKE} -B all install
-	cd ${.CURDIR}/gnu/include;		${MAKE} install
-	cd ${.CURDIR}/gnu/lib/libdialog;	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libobjc;		${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libreadline/readline;	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/lib/libregex;		${MAKE} beforeinstall
-.if !defined(NO_CXX)
-	cd ${.CURDIR}/gnu/lib/libstdc++;	${MAKE} beforeinstall
-	cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus;	${MAKE} beforeinstall
-.endif
-.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \
-    defined(MAKE_KERBEROS5)
-	cd ${.CURDIR}/kerberos5/lib/libasn1;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libhdb;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkadm5clnt;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkadm5srv;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkafs5;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libkrb5;		${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberos5/lib/libsl;		${MAKE} beforeinstall
-.endif
-.if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \
-    defined(MAKE_KERBEROS4)
-	cd ${.CURDIR}/kerberosIV/lib/libacl;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkadm;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkafs;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkdb;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libkrb;	${MAKE} beforeinstall
-	cd ${.CURDIR}/kerberosIV/lib/libtelnet; ${MAKE} beforeinstall
-.elif exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
-	cd ${.CURDIR}/secure/lib/libtelnet;	${MAKE} beforeinstall
-.else
-	cd ${.CURDIR}/lib/libtelnet;		${MAKE} beforeinstall
-.endif
-	cd ${.CURDIR}/lib/libalias;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libatm;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libc;			${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libcalendar;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libcam;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libcom_err;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libdevstat;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libdisk;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libedit;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libfetch;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libftpio;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libkvm;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libmd;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libmp;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libncp;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libncurses;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libnetgraph;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libopie;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libpam/libpam;	${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libpcap;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libradius;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/librpcsvc;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libsbuf;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libstand;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libtacplus;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libusbhid;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libutil;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libvgl;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libwrap;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libypclnt;		${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/libz;			${MAKE} beforeinstall
-	cd ${.CURDIR}/lib/msun;			${MAKE} beforeinstall
-.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE)
-.if exists(${.CURDIR}/secure/lib/libcrypto)
-	cd ${.CURDIR}/secure/lib/libcrypto;	${MAKE} beforeinstall
-.endif
-.if exists(${.CURDIR}/secure/lib/libssl)
-	cd ${.CURDIR}/secure/lib/libssl;	${MAKE} beforeinstall
-.endif
-.endif
-	cd ${.CURDIR}/usr.bin/lex;		${MAKE} beforeinstall
 
 #
 # libraries - build all libraries, and install them under ${DESTDIR}.
@@ -821,9 +735,9 @@ _generic_libs+=	usr.sbin/pcvt/keycap
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	cd ${.CURDIR}/${_lib}; \
-		${MAKE} depend; \
-		${MAKE} all; \
-		${MAKE} install
+		${MAKE} DIRPRFX=${_lib}/ depend; \
+		${MAKE} DIRPRFX=${_lib}/ all; \
+		${MAKE} DIRPRFX=${_lib}/ install
 .endif
 .endfor