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, 8 insertions, 22 deletions

diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 882c268..918b803 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -4,13 +4,12 @@ DISTRIBUTION?=	krb5
 
 .if !defined(INCLUDEOBJDIR)
 
-INCLUDEDIR=	${.CURDIR}/../../include
 KRB4DIR=	${.CURDIR}/../../../crypto/kerberosIV
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
 TELNETDIR=	${.CURDIR}/../../../crypto/telnet
 
-CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
+CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
 
 .if defined(MAKE_KERBEROS4)
 CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4
@@ -148,14 +147,6 @@ k524_err.c k524_err.h: \
 
 CLEANFILES+=k524_err.h k524_err.c k524_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
-
 roken.h: make-roken
 	./make-roken > tmp.h ;\
 	if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
@@ -168,7 +159,6 @@ CLEANFILES+=	make-roken.c make-roken roken.h
 
 .else
 
-INCLUDEDIR=	${.CURDIR}/../../include
 KRB4DIR=	${.CURDIR}/../../crypto/kerberosIV
 KRB5DIR=	${.CURDIR}/../../crypto/heimdal
 ROKENDIR=	${.CURDIR}/../../lib/libroken
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index 7e0313d..c0b5156 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -63,7 +63,7 @@ GEN=						\
 	asn1_TransitedEncoding.x		\
 	asn1_UNSIGNED.x
 
-INCLUDES=krb5_asn1.h asn1_err.h 
+INCS=	krb5_asn1.h asn1_err.h 
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index bf7902e..0492756 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -50,10 +50,8 @@ SRCS=				\
         wrap.c                  \
         address_to_krb5addr.c
 
-INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h heim_err.h krb5_err.h k524_err.h
+INCS=	gssapi.h heim_err.h krb5_err.h k524_err.h
 
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/gssapi
-
-beforedepend all:	heim_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index fd58464..73f8dbc 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -111,8 +111,8 @@ SRCS=	\
 	heim_err.c \
 	heim_err.h
 
-INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \
-	${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h k524_err.h
+INCS=	krb5.h ${.CURDIR}/../../include/krb5-types.h \
+	krb5-protos.h heim_err.h krb5_err.h k524_err.h
 
 MAN3=						\
 	krb5.3					\
@@ -152,5 +152,3 @@ MAN8=						\
 
 .PATH:		${KRB5DIR}/lib/krb5
 .PATH:		${KRB5DIR}/lib/des
-
-beforedepend all:	asn1_err.h krb5_err.h k524_err.h
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 7311f97..5cdf110 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -58,7 +58,7 @@ SRCS=		\
 	strupr.c		\
 	roken.h
 
-INCLUDES= roken.h ${KRB5DIR}/lib/roken/roken-common.h
+INCS=	roken.h ${KRB5DIR}/lib/roken/roken-common.h
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile
index d62356f..2286cf9 100644
--- a/kerberos5/lib/libtelnet/Makefile
+++ b/kerberos5/lib/libtelnet/Makefile
@@ -20,7 +20,7 @@ CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR}
 CFLAGS+=	-DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR}
 
 INCS=		${TELNETDIR}/arpa/telnet.h
-INCDIR=		/usr/include/arpa
+INCSDIR=	${INCLUDEDIR}/arpa
 
 .include <bsd.lib.mk>
 
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index aea7e69..f3a632f 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -10,7 +10,7 @@ krb5-config: krb5-config.in
 		-e "s,@prefix\@,/,g" \
 		-e "s,@exec_prefix\@,/,g" \
 		-e "s,@libdir\@,${LIBDIR},g" \
-		-e "s,@includedir\@,${INCDIR},g" \
+		-e "s,@includedir\@,${INCLUDEDIR},g" \
 		-e "s,@LIB_crypt\@,-lcrypt,g" \
 		-e "s,@LIB_dbopen\@,,g" \
 		-e "s,@LIB_des_appl\@,-lcrypto,g" \