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, 6 insertions, 13 deletions

diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index f73af6c..0bad7af 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -34,8 +34,8 @@ ONEUL=		1UL
 .PATH:  ${NCURSES}/include
 .PATH:  ${NCURSES}/man
 
-INCS=	-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
-CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
+CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include
+CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS
 
 GENSRC= \
 	codes.c \
@@ -60,6 +60,8 @@ GENHDR= \
 # Installed
 HEADERS=curses.h term.h termcap.h unctrl.h
 SRCHDRS=ncurses_dll.h
+INCS=	${HEADERS} ${SRCHDRS}
+INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h
 
 # Components of names.c and codes.c
 NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames
@@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a
 DOCSDIR= /usr/share/doc/ncurses
 DOCS=	ncurses-intro.html hackguide.html
 
-beforeinstall:	${HEADERS}
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \
-	    ${DESTDIR}/usr/include
-	cd ${NCURSES}/include ; \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \
-	    ${DESTDIR}/usr/include
-	rm -f ${DESTDIR}/usr/include/ncurses.h
-	ln -s curses.h ${DESTDIR}/usr/include/ncurses.h
-
 .if !defined(NOHTML)
 afterinstall:
 .for file in ${DOCS}
@@ -282,7 +275,7 @@ codes.c:	 namehdr ${CODESRC} codeftr
 	cat namehdr ${CODESRC} codeftr > $@
 
 lib_gen.c:	MKlib_gen.sh curses.h
-	sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+	sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
 	    "${AWK}" < curses.h >$@
 
 lib_keyname.c:	keys.list MKkeyname.awk
@@ -308,7 +301,7 @@ ncurses_def.h:	MKncurses_def.sh ncurses_defs
 	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
 
 nomacros.h:	MKlib_gen.sh curses.h
-	sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \
+	sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \
 	    "${AWK}" < curses.h | fgrep undef > $@
 
 init_keytry.h:	keys.list make_keys