Replace beforeinstall target with new variables used by .mk system.

Reviewed by:	marcel, and make world

25 files changed, 31 insertions, 114 deletions

diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile
index e540648..05411f5 100644
--- a/lib/libalias/Makefile
+++ b/lib/libalias/Makefile
@@ -6,10 +6,7 @@ SHLIB_MINOR=	0
 CFLAGS+=	-Wall -I${.CURDIR}
 SRCS=		alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
 		alias_nbt.c alias_proxy.c alias_util.c
+INCS=		alias.h
 MAN3=		libalias.3 
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/alias.h \
-	    ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libatm/Makefile b/lib/libatm/Makefile
index 218bf9f..1de2e13 100644
--- a/lib/libatm/Makefile
+++ b/lib/libatm/Makefile
@@ -29,12 +29,9 @@
 
 LIB=	atm
 SRCS=	atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
+INCS=	libatm.h
 
 LDADD+=	-lmd
 DPADD+=	${LIBMD}
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/libatm.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile
index 4ecd11a..9674405 100644
--- a/lib/libcalendar/Makefile
+++ b/lib/libcalendar/Makefile
@@ -3,6 +3,7 @@
 LIB=	calendar
 
 SRCS=	calendar.c easter.c
+INCS=	calendar.h
 
 MAN3=   calendar.3
 
@@ -13,8 +14,4 @@ MLINKS=	calendar.3 easterg.3 calendar.3 easterog.3 calendar.3 easteroj.3 \
 
 CFLAGS+=-I. -I${.CURDIR} -Wall
 
-beforeinstall:
-	${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${.CURDIR}/calendar.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
index 6f47001..2258964 100644
--- a/lib/libcam/Makefile
+++ b/lib/libcam/Makefile
@@ -1,7 +1,10 @@
+# $FreeBSD$
+
 MAINTAINER=ken@FreeBSD.ORG
 
 LIB=	cam
 SRCS=	camlib.c scsi_cmdparse.c scsi_all.c scsi_sa.c cam.c
+INCS=	camlib.h
 
 MAN3=	cam.3 cam_cdbparse.3
 
@@ -29,10 +32,6 @@ MLINKS+=cam.3 cam_open_device.3 \
 	cam_cdbparse.3 csio_encode_visit.3 \
 	cam_cdbparse.3 buff_encode_visit.3
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/camlib.h \
-	    ${DESTDIR}/usr/include
-
 .PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam
 
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../sys
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 847497d..081a0b7 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -2,17 +2,13 @@
 
 LIB=	com_err
 SRCS=	com_err.c error.c
+INCS=	${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
 MAN3=	com_err.3
 COM_ERRDIR=	${.CURDIR}/../../contrib/com_err
 CFLAGS+=	-I${COM_ERRDIR}
 
 SUBDIR=	doc
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
 
 .PATH:	${COM_ERRDIR}
diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile
index 8a3b2b2..73e51c9 100644
--- a/lib/libdevstat/Makefile
+++ b/lib/libdevstat/Makefile
@@ -1,7 +1,10 @@
+# $FreeBSD$
+
 MAINTAINER=ken@FreeBSD.ORG
 
 LIB=	devstat
 SRCS=	devstat.c
+INCS=	devstat.h
 
 MAN3=	devstat.3
 
@@ -15,10 +18,6 @@ MLINKS+=devstat.3 buildmatch.3
 MLINKS+=devstat.3 compute_stats.3
 MLINKS+=devstat.3 compute_etime.3
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/devstat.h \
-	    ${DESTDIR}/usr/include
-
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../sys
 
 .include <bsd.lib.mk>
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 355018a..f901a76 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -3,6 +3,7 @@
 LIB=	disk
 SRCS=	blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \
 	create_chunk.c rules.c write_disk.c
+INCS=	libdisk.h
 
 CFLAGS+= 	-Wall
 CLEANFILES+=	tmp.c tst01 tst01.o
@@ -42,10 +43,5 @@ MLINKS+=	libdisk.3 Open_Disk.3 \
 
 .include <bsd.lib.mk>
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/libdisk.h \
-	    ${DESTDIR}/usr/include/libdisk.h
-
-
 tst01: tst01.o libdisk.a
 	cc ${CFLAGS} -static tst01.o -o tst01 libdisk.a
diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index f40f2b6..21d615a 100644
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -8,18 +8,13 @@ CFLAGS+=	-DNDEBUG
 .endif
 SRCS=		fetch.c common.c ftp.c http.c file.c fetch_err.c \
 		fetch_err.h ftperr.h httperr.h
+INCS=		fetch.h ${.OBJDIR}/fetch_err.h
 MAN3=		fetch.3
 CLEANFILES=	fetch_err.c fetch_err.h ftperr.h httperr.h
 
 SHLIB_MAJOR=    1
 SHLIB_MINOR=	0
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/fetch.h \
-		${DESTDIR}/usr/include
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 fetch_err.h \
-		${DESTDIR}/usr/include
-
 ftperr.h: ftp.errors
 	@echo "static struct fetcherr _ftp_errlist[] = {" > ${.TARGET}
 	@cat ${.ALLSRC} \
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index 83dfbc6..aeb6e1d 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -12,12 +12,9 @@ SRCS=	fty_regex.c fty_num.c fty_int.c fty_ipv4.c fty_enum.c fty_alpha.c \
 	fty_alnum.c \
 	frm_data.c frm_win.c frm_user.c frm_opts.c frm_hook.c frm_req_name.c \
 	fld_user.c fld_type.c fld_stat.c fld_def.c frm_def.c frm_driver.c
+INCS=	${NCURSES}/form/form.h
 
 CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
 	-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${NCURSES}/form/form.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index ecbc730..7709dea 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -5,14 +5,11 @@ SHLIB_MAJOR=	5
 SHLIB_MINOR=	0
 
 SRCS=		ftpio.c ftperr.c
+INCS=		ftpio.h
 CFLAGS+=	-I${.CURDIR} -Wall
 MAN3=		ftpio.3
 CLEANFILES=	ftperr.c
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/ftpio.h \
-		${DESTDIR}/usr/include
-
 ftperr.c:	ftp.errors
 	@echo '#include <stdio.h>' > ${.TARGET}
 	@echo '#include "ftpio.h"' >> ${.TARGET}
diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile
index 75dcc7f..325524f 100644
--- a/lib/libkvm/Makefile
+++ b/lib/libkvm/Makefile
@@ -5,6 +5,7 @@ LIB=	kvm
 CFLAGS+=-DLIBC_SCCS -I${.CURDIR}/../../sys
 SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_proc.c
+INCS=	kvm.h
 
 MAN3=	kvm.3 kvm_geterr.3 kvm_getfiles.3 kvm_getloadavg.3 kvm_getprocs.3 \
 	kvm_getswapinfo.3 kvm_nlist.3 kvm_open.3 kvm_read.3
@@ -13,8 +14,4 @@ MLINKS+=kvm_getprocs.3 kvm_getargv.3 kvm_getprocs.3 kvm_getenvv.3
 MLINKS+=kvm_open.3 kvm_close.3 kvm_open.3 kvm_openfiles.3
 MLINKS+=kvm_read.3 kvm_write.3
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/kvm.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index 3264f0a..5762808 100644
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@@ -4,6 +4,8 @@ LIB=	md
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \
 	rmd160c.c rmd160hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c
+INCS=	md2.h md4.h md5.h ripemd.h sha.h
+
 MAN3+=  md2.3 md4.3 md5.3 ripemd.3 sha.3
 MLINKS+=md2.3 MD2Init.3 md2.3 MD2Update.3 md2.3 MD2Final.3
 MLINKS+=md2.3 MD2End.3  md2.3 MD2File.3   md2.3 MD2Data.3
@@ -171,10 +173,4 @@ test:	md2.ref md4.ref md5.ref sha0.ref rmd160.ref sha1.ref
 	@${ECHO} SHA-1 passed test
 	-rm -f shadriver
 
-beforeinstall:
-.for i in md2.h md4.h md5.h ripemd.h sha.h
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/$i \
-		${DESTDIR}/usr/include
-.endfor
-
 .include <bsd.lib.mk>
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index 11fb19d..e6ed97e 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -11,14 +11,9 @@ SRCS=	m_attribs.c m_cursor.c m_driver.c m_format.c m_global.c m_hook.c \
 	m_item_cur.c m_item_nam.c m_item_new.c m_item_opt.c m_item_use.c \
 	m_item_val.c m_item_vis.c m_items.c m_new.c m_opts.c m_post.c \
 	m_req_name.c m_spacing.c m_userptr.c m_win.c
+INCS=	${NCURSES}/menu/menu.h ${NCURSES}/menu/eti.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/menu -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-.for i in menu.h eti.h
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${NCURSES}/menu/$i \
-		${DESTDIR}/usr/include
-.endfor
-
 .include <bsd.lib.mk>
diff --git a/lib/libnetgraph/Makefile b/lib/libnetgraph/Makefile
index fe96f3d..39d9ad8 100644
--- a/lib/libnetgraph/Makefile
+++ b/lib/libnetgraph/Makefile
@@ -8,11 +8,8 @@ SHLIB_MAJOR=	1
 #SHLIB_MINOR=	1
 
 SRCS=		sock.c msg.c debug.c
+INCS=		netgraph.h
 
 CFLAGS+=	-Wall
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/netgraph.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile
index 22b01eb..1613878 100644
--- a/lib/libopie/Makefile
+++ b/lib/libopie/Makefile
@@ -18,6 +18,7 @@ SRCS=	atob8.c btoa8.c btoh.c challenge.c getsequence.c hash.c hashlen.c \
 	btoe.c accessfile.c generator.c insecure.c getutmpentry.c \
 	readrec.c writerec.c login.c open.c logwtmp.c \
 	getutline.c pututline.c endutent.c setutent.c # from libmissing
+INCS=	${OPIE_DIST}/opie.h
 
 CFLAGS+=-I${.CURDIR} -I${OPIE_DIST} -I${DIST_DIR} \
 	-DKEY_FILE=${KEYFILE}
@@ -28,8 +29,4 @@ DPADD+=	${LIBMD}
 MAN4=	${OPIE_DIST}/opie.4
 MAN5=	${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${OPIE_DIST}/opie.h \
-			${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index f878817..cbe2ebb 100644
--- a/lib/libpanel/Makefile
+++ b/lib/libpanel/Makefile
@@ -8,12 +8,9 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
 LIB=    panel
 
 SRCS=	panel.c
+INCS=	${NCURSES}/panel/panel.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/panel -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${NCURSES}/panel/panel.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libradius/Makefile b/lib/libradius/Makefile
index ec8bdf7..f480793 100644
--- a/lib/libradius/Makefile
+++ b/lib/libradius/Makefile
@@ -26,6 +26,7 @@
 
 LIB=		radius
 SRCS=		radlib.c
+INCS=		radlib.h
 CFLAGS+=	-Wall
 DPADD+=		${LIBMD}
 LDADD+=		-lmd
@@ -34,8 +35,4 @@ SHLIB_MINOR=	0
 MAN3+=		libradius.3
 MAN5+=		radius.conf.5
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/radlib.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index 4ad0fe3..42216d8 100644
--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@@ -1,7 +1,9 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/7/91
+#	$FreeBSD$
 
 LIB=	skey
 SRCS=	skeyaccess.c put.c skey_crypt.c skey_getpass.c skeylogin.c skeysubr.c
+INCS=	skey.h
 MAN1=	skey.1
 MAN3=	skey.3
 MLINKS=	skey.3 skeylookup.3 skey.3 skeyverify.3 skey.3 skeychallenge.3 \
@@ -18,8 +20,4 @@ CFLAGS+=-Werror
 DPADD+= ${LIBCRYPT} ${LIBMD}
 LDADD+=	-lcrypt -lmd
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/skey.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libtacplus/Makefile b/lib/libtacplus/Makefile
index 798a8e0..1da6672 100644
--- a/lib/libtacplus/Makefile
+++ b/lib/libtacplus/Makefile
@@ -26,6 +26,7 @@
 
 LIB=		tacplus
 SRCS=		taclib.c
+INCS=		taclib.h
 CFLAGS+=	-Wall
 DPADD+=		${LIBMD}
 LDADD+=		-lmd
@@ -34,8 +35,4 @@ SHLIB_MINOR=	0
 MAN3+=		libtacplus.3
 MAN5+=		tacplus.conf.5
 
-beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/taclib.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 772fc7f..f0e9fda 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -9,6 +9,7 @@ SRCS=	login.c login_tty.c logout.c logwtmp.c pty.c setproctitle.c \
 	login_cap.c login_class.c login_auth.c login_times.c login_ok.c \
 	_secure_path.c uucplock.c property.c auth.c realhostname.c fparseln.c \
 	stat_flags.c
+INCS=	libutil.h login_cap.h
 MAN3+=	login.3 login_auth.3 login_tty.3 logout.3 logwtmp.3 pty.3 \
 	setproctitle.3 login_cap.3 login_class.3 login_times.3 login_ok.3 \
 	_secure_path.3 uucplock.3 property.3 auth.3 realhostname.3 \
@@ -36,10 +37,4 @@ MLINKS+=login_auth.3 auth_checknologin.3 login_auth.3 auth_cat.3
 MLINKS+=uucplock.3 uu_lock.3 uucplock.3 uu_lock_txfr.3 \
 	uucplock.3 uu_unlock.3 uucplock.3 uu_lockerr.3
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/libutil.h \
-		${DESTDIR}/usr/include
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/login_cap.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libvgl/Makefile b/lib/libvgl/Makefile
index cde6026..1a06c7a 100644
--- a/lib/libvgl/Makefile
+++ b/lib/libvgl/Makefile
@@ -4,6 +4,7 @@ SHLIB_MAJOR= 2
 SHLIB_MINOR= 0
 CFLAGS+=-Wall -I${.CURDIR}
 SRCS=	main.c simple.c bitmap.c text.c mouse.c keyboard.c
+INCS=	vgl.h
 MAN3=	vgl.3
 MLINKS+=	vgl.3 VGLBitmapCopy.3 \
 		vgl.3 VGLBitmapPutChar.3 \
@@ -29,8 +30,4 @@ MLINKS+=	vgl.3 VGLBitmapCopy.3 \
 		vgl.3 VGLSetPaletteIndex.3 \
 		vgl.3 VGLTextSetFontFile.3
 
-beforeinstall:
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgl.h \
-		${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 250e005..abb4b19 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -16,12 +16,7 @@ CLEANFILES+=	example.o example foo.gz minigzip.o minigzip
 
 SRCS = adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c trees.c \
        zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c inffast.c
-
-beforeinstall:
-.for hdr in zconf.h zlib.h
-	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/${hdr} \
-		${DESTDIR}/usr/include
-.endfor
+INCS=		zconf.h zlib.h
 
 minigzip:	all minigzip.o
 	$(CC) -o minigzip minigzip.o -L. -lz
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index 83dfbc6..aeb6e1d 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -12,12 +12,9 @@ SRCS=	fty_regex.c fty_num.c fty_int.c fty_ipv4.c fty_enum.c fty_alpha.c \
 	fty_alnum.c \
 	frm_data.c frm_win.c frm_user.c frm_opts.c frm_hook.c frm_req_name.c \
 	fld_user.c fld_type.c fld_stat.c fld_def.c frm_def.c frm_driver.c
+INCS=	${NCURSES}/form/form.h
 
 CFLAGS+=-I${.CURDIR}/../libncurses -I${NCURSES}/form -I${NCURSES}/menu \
 	-I${NCURSES}/include -Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${NCURSES}/form/form.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 11fb19d..e6ed97e 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -11,14 +11,9 @@ SRCS=	m_attribs.c m_cursor.c m_driver.c m_format.c m_global.c m_hook.c \
 	m_item_cur.c m_item_nam.c m_item_new.c m_item_opt.c m_item_use.c \
 	m_item_val.c m_item_vis.c m_items.c m_new.c m_opts.c m_post.c \
 	m_req_name.c m_spacing.c m_userptr.c m_win.c
+INCS=	${NCURSES}/menu/menu.h ${NCURSES}/menu/eti.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/menu -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-.for i in menu.h eti.h
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${NCURSES}/menu/$i \
-		${DESTDIR}/usr/include
-.endfor
-
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index f878817..cbe2ebb 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -8,12 +8,9 @@ NCURSES=${.CURDIR}/../../contrib/ncurses
 LIB=    panel
 
 SRCS=	panel.c
+INCS=	${NCURSES}/panel/panel.h
 
 CFLAGS+= -I${.CURDIR}/../libncurses -I${NCURSES}/panel -I${NCURSES}/include \
 	-Wall -DNDEBUG -DHAVE_CONFIG_H
 
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${NCURSES}/panel/panel.h ${DESTDIR}/usr/include
-
 .include <bsd.lib.mk>