===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/share/termtypes/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/share/termtypes/Makefile	2011/07/19 10:20:20	1.22
+++ src/share/termtypes/Makefile	2015/11/21 08:05:27	1.23
@@ -1,12 +1,11 @@
-#	$OpenBSD: Makefile,v 1.22 2011/07/19 10:20:20 millert Exp $
+#	$OpenBSD: Makefile,v 1.23 2015/11/21 08:05:27 nicm Exp $
 #
 # Take termcap/terminfo master file and generate termcap/terminfo .db files
 
 MAN=	termcap.5
-CLEANFILES+= terminfo.src termcap.src terminfo.db termcap.db termcap
 TIC=	/usr/bin/tic
 
-all: terminfo.db termcap.db termcap
+all: terminfo.db termcap.db terminfo termcap
 
 terminfo.src: termtypes.master
 	${TIC} -I -x ${.ALLSRC} | sed -e '/^#/d' -e '/^$$/d' > ${.TARGET}
@@ -15,6 +14,10 @@
 terminfo.db: terminfo.src
 	cap_mkdb -i -f terminfo ${.ALLSRC}
 
+terminfo: termtypes.master
+	${TIC} -x -o ${.TARGET} ${.ALLSRC}
+	@[ -d ${.TARGET} ] || exit 1
+
 termcap.src: termcap
 	sed -e '/^#/d' -e '/^$$/d' ${.ALLSRC} > ${.TARGET}
 	@[ -s ${.TARGET} ] || exit 1
@@ -27,6 +30,9 @@
 	@[ -s ${.TARGET} ] || exit 1
 
 realinstall:
+	find terminfo -type f -exec \
+	     ${INSTALL} -D ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	     {} ${DESTDIR}${BINDIR}/{} \;
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \
 	     ${DESTDIR}${BINDIR}/misc/terminfo.db
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \
@@ -34,5 +40,9 @@
 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap \
 	     ${DESTDIR}${BINDIR}/misc/termcap
 	ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
+
+clean:
+	rm -f terminfo.src termcap.src terminfo.db termcap.db termcap
+	rm -rf terminfo
 
 .include <bsd.prog.mk>