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

7 files changed, 6 insertions, 22 deletions

diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index d21105cb9855..97aa76c56273 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -91,14 +91,6 @@ ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h: ${KRB4DIR}/lib/krb/krb_err.et
 
 CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.et
 
-.if defined(INCLUDES)
-beforeinstall: ${INCLUDES}
-.for INC in ${INCLUDES}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${INC} ${DESTDIR}/usr/include
-.endfor
-.endif
-
 .else
 
 KRB4DIR=	${.CURDIR}/../../crypto/kerberosIV
diff --git a/kerberosIV/lib/libacl/Makefile b/kerberosIV/lib/libacl/Makefile
index 87c360f2f377..347131b4cbf7 100644
--- a/kerberosIV/lib/libacl/Makefile
+++ b/kerberosIV/lib/libacl/Makefile
@@ -8,6 +8,7 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${INCLUDEOBJDIR} \
 		-I${.OBJDIR}
 SRCS=		acl_files.c protos.h
+INCS=		acl.h
 MAN=		${KRB4DIR}/man/acl_check.3
 MLINKS=		acl_check.3 acl_canonicalize_principal.3 \
 		acl_check.3 acl_exact_match.3 \
@@ -15,8 +16,6 @@ MLINKS=		acl_check.3 acl_canonicalize_principal.3 \
 		acl_check.3 acl_delete.3 \
 		acl_check.3 acl_initialize.3
 
-INCLUDES=	${KRB4DIR}/lib/acl/acl.h
-
 .include <bsd.lib.mk>
 
 .PATH:		${KRB4DIR}/lib/acl
diff --git a/kerberosIV/lib/libkadm/Makefile b/kerberosIV/lib/libkadm/Makefile
index b868be25a4ce..9019aae78b6c 100644
--- a/kerberosIV/lib/libkadm/Makefile
+++ b/kerberosIV/lib/libkadm/Makefile
@@ -13,8 +13,7 @@ CFLAGS+=	-I${KRB4DIR}/include \
 SRCS=		kadm_cli_wrap.c kadm_stream.c kadm_supp.c \
 		${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h \
 		${KRBOBJDIR}/krb_err.h check_password.c protos.h
-
-INCLUDES=	${KRB4DIR}/lib/kadm/kadm.h ${KADMOBJDIR}/kadm_err.h
+INCS=		kadm.h ${KADMOBJDIR}/kadm_err.h
 
 .include <bsd.lib.mk>
 
diff --git a/kerberosIV/lib/libkafs/Makefile b/kerberosIV/lib/libkafs/Makefile
index ee6952c11c4c..93af2f821b77 100644
--- a/kerberosIV/lib/libkafs/Makefile
+++ b/kerberosIV/lib/libkafs/Makefile
@@ -8,14 +8,12 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KRB4DIR}/lib/kafs
 SRCS=		afssys.c afskrb.c common.c issuid.c \
 		strlcpy.c strlcat.c
+INCS=		kafs.h
 MAN=		${KRB4DIR}/man/kafs.3
 MLINKS=		kafs.3 k_hasafs.3 kafs.3 k_afsklog.3 kafs.3 k_afsklog_uid.3 \
 		kafs.3 k_pioctl.3 kafs.3 k_unlog.3 kafs.3 k_setpag.3 \
 		kafs.3 k_afs_cell_of_file.3
 
-
-INCLUDES=	${KRB4DIR}/lib/kafs/kafs.h
-
 .include <bsd.lib.mk>
 
 .PATH:		${KRB4DIR}/lib/kafs
diff --git a/kerberosIV/lib/libkdb/Makefile b/kerberosIV/lib/libkdb/Makefile
index 1e3878aed1c1..fc5db4df709a 100644
--- a/kerberosIV/lib/libkdb/Makefile
+++ b/kerberosIV/lib/libkdb/Makefile
@@ -9,8 +9,7 @@ CFLAGS+=	-I${KRB4DIR}/include \
 		-I${KADMOBJDIR}
 SRCS=		krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c \
 		print_princ.c
-
-INCLUDES=	${KRB4DIR}/lib/kdb/kdc.h ${KRB4DIR}/lib/kdb/krb_db.h
+INCS=		kdc.h krb_db.h
 
 .include <bsd.lib.mk>
 
diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile
index ddaa813c8979..69af18b7e764 100644
--- a/kerberosIV/lib/libkrb/Makefile
+++ b/kerberosIV/lib/libkrb/Makefile
@@ -30,6 +30,7 @@ SRCS=		check_time.c cr_err_reply.c create_auth_reply.c \
 		strcasecmp.c strlcat.c strlcpy.c strdup.c strncasecmp.c \
 		strnlen.c strtok_r.c swab.c ${KRBOBJDIR}/krb_err.c \
 		${KRBOBJDIR}/krb_err.h protos.h
+INCS=		krb.h klog.h krb-protos.h prot.h ${KRBOBJDIR}/krb_err.h
 MAN=		${KRB4DIR}/man/kerberos.3 \
 		${KRB4DIR}/man/krb_realmofhost.3 \
 		${KRB4DIR}/man/krb_sendauth.3 \
@@ -61,10 +62,6 @@ MLINKS=		kerberos.3 krb_mk_req.3 \
 		tf_util.3 tf_get_cred.3 \
 		tf_util.3 tf_close.3
 
-INCLUDES=	${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \
-		${KRB4DIR}/lib/krb/krb-protos.h \
-		${KRB4DIR}/lib/krb/prot.h ${KRBOBJDIR}/krb_err.h
-
 .include <bsd.lib.mk>
 
 .PATH:		${KRB4DIR}/lib/krb
diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile
index 068622f7f276..7b3f012447ab 100644
--- a/kerberosIV/lib/libtelnet/Makefile
+++ b/kerberosIV/lib/libtelnet/Makefile
@@ -16,7 +16,7 @@ CFLAGS+=	-DKRB4 -I${KRB4DIR}/lib/krb
 WARNS?=		2
 
 INCS=		${TELNETDIR}/arpa/telnet.h
-INCDIR=		/usr/include/arpa
+INCSDIR=	${INCLUDEDIR}/arpa
 
 .include <bsd.lib.mk>