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

8 files changed, 18 insertions, 43 deletions

diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 9bca202..40d98b4 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 LIB=    dialog
+INCS=	dialog.h
 MAN=	dialog.3
 
 SHLIB_MAJOR= 4
@@ -20,10 +21,6 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE
 LDADD+= -lncurses
 DPADD+= ${LIBNCURSES}
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dialog.h \
-	      ${DESTDIR}/usr/include
-
 .if !defined(NOHTML)
 afterinstall:
 .for file in ${EXAMPLES}
diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile
index 4656b87..264d5ff 100644
--- a/gnu/lib/libg2c/Makefile
+++ b/gnu/lib/libg2c/Makefile
@@ -117,8 +117,6 @@ ${E77OBJS:.o=.po}: f2cext.c
 	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/g2c.h \
-	    ${DESTDIR}/usr/include
+INCS=	g2c.h
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile
index 06b3f20..7dd6ef0 100644
--- a/gnu/lib/libiberty/Makefile
+++ b/gnu/lib/libiberty/Makefile
@@ -2,7 +2,7 @@
 
 SRCDIR=	${.CURDIR}/../../../contrib/binutils/libiberty
 
-.PATH: ${SRCDIR}
+.PATH: ${SRCDIR} ${SRCDIR}/../include
 
 LIB=    iberty
 NOPIC=	true
@@ -18,11 +18,8 @@ SRCS=	argv.c choose-temp.c concat.c cplus-dem.c fdmatch.c fnmatch.c getopt.c \
 CFLAGS+= -I${SRCDIR}/../include -I${.CURDIR}
 CFLAGS+= -DHAVE_CONFIG_H
 
-HDRS=	alloca-conf.h ansidecl.h demangle.h floatformat.h fnmatch.h getopt.h \
-	libiberty.h objalloc.h obstack.h
-
-#beforeinstall:
-#	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-#	    ${HDRS:S;^;${SRCDIR}/../include/;} ${DESTDIR}/usr/include/libiberty
+#INCS=	alloca-conf.h ansidecl.h demangle.h floatformat.h fnmatch.h getopt.h \
+#	libiberty.h objalloc.h obstack.h
+#INCSDIR=${INCLUDEDIR}/libiberty
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 65c5c63..35cf26a 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -14,18 +14,15 @@ SRCS=   archive.c class.c encoding.c gc.c hash.c init.c misc.c \
 	thr.c thr-single.c \
 	NXConstStr.m Object.m Protocol.m linking.m
 
-HDRS=	encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \
+INCS=	encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \
 	sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h
+INCSDIR=${INCLUDEDIR}/objc
 
 CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS
 CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools
 CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} 
 CFLAGS+= -I${GCCDIR}/config -I${GCCDIR}
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${HDRS:S;^;${OBJCDIR}/objc/;} ${DESTDIR}/usr/include/objc
-
 GENHDRS=	runtime-info.h tconfig.h
 CLEANFILES+=	${GENHDRS}
 SRCS+=		${GENHDRS}
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 9159302..57fa012 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -17,7 +17,7 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 DPADD=	${LIBNCURSES}
 LDADD=	-lncurses
 
-INCDIR=	/usr/include/readline
+INCSDIR=${INCLUDEDIR}/readline
 
 .for hdr in ${INSTALLED_HEADERS}
 INCS+=	${SRCDIR}/${hdr}
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 968308e..d351027 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -7,12 +7,10 @@ SHLIB_MAJOR=	2
 SHLIB_MINOR=	0
 
 SRCS=	regex.c
+INCS=	regex.h
+INCSNAME= gnuregex.h
 NOMAN=	noman
 
 CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \
-		${DESTDIR}/usr/include/gnuregex.h
-
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile
index 3e7e943..d27fe64 100644
--- a/gnu/lib/libstdc++/Makefile
+++ b/gnu/lib/libstdc++/Makefile
@@ -2,7 +2,7 @@
 
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++-v3/src
 .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \
-       ${SRCDIR}/config/locale/generic ${SRCDIR}
+       ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std
 
 SUBDIR=	doc
 
@@ -87,19 +87,10 @@ THDHDRS=gthr.h gthr-single.h gthr-posix.h gthr-default.h
 BASEDHDRS_renamed=	${BASEDHDRS:Mstd_*:S/std_//g:S/.h//g}
 STDHDRS_renamed=	${STDHDRS:Mstd_*:S/std_//g:S/.h//g}
 
-#------------------------------------------------------------------------------
+INCS=		_G_config.h ${HDRS:S;^;${SRCDIR}/;} ${IHDRS} ${STLHDRS}
 
-# gxx_include_dir = $(prefix)/include/g++-v3
-beforeinstall:
-	mkdir -p ${DESTDIR}/usr/include/g++/{backward,ext}
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/_G_config.h \
-	    ${HDRS:S;^;${SRCDIR}/;} \
-	    ${IHDRS:S;^;${SRCDIR}/../libio/;} \
-	    ${STLHDRS:S;^;${SRCDIR}/stl/;} \
-	    ${DESTDIR}/usr/include/g++
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${STDHDRS:S;^;${SRCDIR}/std/;} \
-	    ${DESTDIR}/usr/include/g++/std
+INCSGROUPS=	INCS STDHDRS
+INCSDIR=	${INCLUDEDIR}/g++
+STDHDRSDIR=	${INCLUDEDIR}/g++/std
 
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile
index a35befc..2e5b1cc 100644
--- a/gnu/lib/libsupc++/Makefile
+++ b/gnu/lib/libsupc++/Makefile
@@ -19,10 +19,7 @@ CXXFLAGS+=	-nostdinc++ \
 		-fno-implicit-templates -ffunction-sections -fdata-sections
 
 HDRS=	exception new typeinfo cxxabi.h exception_defines.h
-
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${HDRS:S;^;${SRCDIR}/;} \
-	    ${DESTDIR}/usr/include/g++-v3
+INCS=	${HDRS:S;^;${SRCDIR}/;}
+INCSDIR=${INCLUDEDIR}/g++-v3
 
 .include <bsd.lib.mk>