[src/trunk]: src/lib/libterminfo use the tools version of utilities for other...

[yamt <yamt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ab4bfaa1eadc
branches:  trunk
changeset: 770932:ab4bfaa1eadc
user:      yamt <yamt%NetBSD.org@localhost>
date:      Wed Nov 02 20:39:41 2011 +0000

description:
use the tools version of utilities for other scripts, too

diffstat:

 lib/libterminfo/Makefile      |   6 +++---
 lib/libterminfo/Makefile.hash |  17 +++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diffs (56 lines):

diff -r 3153e6cb52c8 -r ab4bfaa1eadc lib/libterminfo/Makefile
--- a/lib/libterminfo/Makefile  Wed Nov 02 20:36:41 2011 +0000
+++ b/lib/libterminfo/Makefile  Wed Nov 02 20:39:41 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2011/11/02 17:48:53 christos Exp $
+#      $NetBSD: Makefile,v 1.20 2011/11/02 20:39:41 yamt Exp $
 
 .include <bsd.own.mk>
 
@@ -44,9 +44,9 @@
 termcap.c: termcap_hash.c
 
 # Generate our man pages
-terminfo.5: terminfo.5.in term.h termcap_map.c
+terminfo.5: genman terminfo.5.in term.h termcap_map.c
                @echo "Generating terminfo man pages"
-               cd ${.CURDIR} && ${HOST_SH} ./genman >${.OBJDIR}/$@
+               ${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES+=   terminfo.5
 
diff -r 3153e6cb52c8 -r ab4bfaa1eadc lib/libterminfo/Makefile.hash
--- a/lib/libterminfo/Makefile.hash     Wed Nov 02 20:36:41 2011 +0000
+++ b/lib/libterminfo/Makefile.hash     Wed Nov 02 20:39:41 2011 +0000
@@ -1,20 +1,25 @@
-#      $NetBSD: Makefile.hash,v 1.2 2011/11/02 20:30:00 christos Exp $
+#      $NetBSD: Makefile.hash,v 1.3 2011/11/02 20:39:41 yamt Exp $
+
+SCRIPT_ENV=    \
+       TOOL_AWK=${TOOL_AWK:Q} \
+       TOOL_NBPERF=${TOOL_NBPERF:Q} \
+       TOOL_SED=${TOOL_SED:Q} \
+       TOOL_SORT=${TOOL_SORT:Q} \
+       TOOL_TIC=${TOOL_TIC:Q}
 
 PARSEDIR:=${.PARSEDIR}
 # Generate our string and hash tables
 hash.c: genhash term.h
                @echo "Generating terminfo hash"
-               TOOL_NBPERF=${TOOL_NBPERF} TOOL_AWK=${TOOL_AWK} \
-                   TOOL_SED=${TOOL_SED} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
+               ${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
 
 termcap_hash.c: genthash termcap_map.c
                @echo "Generating termcap hash"
-               ${HOST_SH} ${.ALLSRC} > ${.TARGET}
-
+               ${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
 
 # Allow terminfo descriptions to be compiled into libterminfo
 compiled_terms.c: genterms term.h ${NETBSDSRCDIR}/share/terminfo/terminfo
                @echo "Generating compiled terminfo descriptions"
-               ${HOST_SH} ${.ALLSRC} > ${.TARGET}
+               ${SCRIPT_ENV} ${HOST_SH} ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES+=   hash.c termcap_hash.c compiled_terms.c