7 files changed, 9 insertions, 23 deletions

diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index cf41eff28dcb..856b7773f3df 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 4656b87ad6c6..264d5ffe38a3 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/libgmp/Makefile b/gnu/lib/libgmp/Makefile
index 130129c4ca51..023509394054 100644
--- a/gnu/lib/libgmp/Makefile
+++ b/gnu/lib/libgmp/Makefile
@@ -137,9 +137,7 @@ mpz mpf mpq:
 
 CLEANDIRS+=	mpz mpf mpq
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${GMPDIR}/gmp.h ${DESTDIR}/usr/include
+INCS=		gmp.h
 
 .include "Makefile.inc"
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 8a37ed83490c..315b2b67b7e9 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -101,9 +101,7 @@ mpz:
 
 CLEANDIRS+=	 ${.OBJDIR}/mpz ${.CURDIR}/mpz
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${GMPDIR}/mp.h ${DESTDIR}/usr/include
+INCS=		mp.h
 
 .include "../libgmp/Makefile.inc"
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile
index 7d09ae5ec300..ae48aa1d42fa 100644
--- a/gnu/lib/libobjc/Makefile
+++ b/gnu/lib/libobjc/Makefile
@@ -14,16 +14,13 @@ 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+= -I${OBJCDIR}/objc -I${OBJCDIR} -I.
 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 tm.h 
 CLEANFILES+=	${GENHDRS}
 SRCS+=		${GENHDRS}
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index af3a252ca03f..0ad33206c79d 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -18,7 +18,7 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \
 DPADD+= $(LIBTERMCAP)
 LDADD+= -ltermcap
 
-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 968308e8c67c..d351027a8d09 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>