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

4 files changed, 10 insertions, 27 deletions

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index 71166cb..9ad59f0 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -365,11 +365,9 @@ MLINKS= des_crypt.3 des_read_password.3 \
 	des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \
 	des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
 
-beforeinstall:  openssl/opensslconf.h openssl/evp.h
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${CRYPTO_HDRS} openssl/evp.h openssl/opensslconf.h \
-	    ${DESTDIR}/usr/include/openssl
-	ln -fs openssl/des.h ${DESTDIR}/usr/include/des.h
+INCS=		${HDRS} openssl/evp.h openssl/opensslconf.h
+INCSDIR=	/usr/include/openssl
+INCSLINKS=	openssl/des.h ${INCLUDEDIR}/des.h
 
 afterinstall:
 .if !defined(NOPIC)
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index ec09438..352d915 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -29,10 +29,6 @@ HDRS=	asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \
 HDRS+= idea/idea.h
 .endif
 
-.for h in ${HDRS}
-CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h}
-.endfor
-
 SRCS+=		buildinf.h openssl/opensslconf.h openssl/evp.h
 CLEANFILES+=	buildinf.h openssl/opensslconf.h openssl/evp.h
 CLEANDIRS+=	openssl
@@ -46,17 +42,16 @@ buildinf.h:
 	echo "#endif" ) > ${.TARGET}
 
 #	XXX:  The openssl/ dependencies are not correct, in that a change in
-#	any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
+#	any of ${HDRS} ${EXTRA_HDRS} will no repopulate openssl/.
 #	This deficiency will be fixed in a later commit.
 
-.ORDER:	openssl/opensslconf.h openssl/evp.h
-
 openssl/opensslconf.h:  ../libcrypto/opensslconf-${MACHINE_ARCH}.h
 	mkdir -p openssl
 	cp ${.OODATE} ${.TARGET}
-	${INSTALL} -C -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl
+	${INSTALL} -C -m 444 ${HDRS:S;^;${LCRYPTO_SRC}/;} ${EXTRA_HDRS} openssl
 
 openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h
+	mkdir -p openssl
 .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES
 	sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
 .else
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
index daf4a4f..9fbaf33 100644
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -18,18 +18,8 @@ SRCS+=	bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \
 	ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \
 	ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \
 
-HDRS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
-
-.for h in ${HDRS}
-CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h}
-.endfor
-
-.for h in ${HDRS}
-SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h}
-.endfor
-
-beforeinstall:  openssl/opensslconf.h openssl/evp.h
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${SSL_HDRS} ${DESTDIR}/usr/include/openssl
+INCS=	ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h
+INCSDIR=${INCLUDEDIR}/openssl
+HDRS+=	${INCS:S;^;../ssl/;}
 
 .include <bsd.lib.mk>
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index b964e16..1e0fb0c 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -15,7 +15,7 @@ CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
 WARNS?=		2
 
 INCS=		${TELNETDIR}/arpa/telnet.h
-INCDIR=		/usr/include/arpa
+INCSDIR=	${INCLUDEDIR}/arpa
 
 .include <bsd.lib.mk>