Rename a large chunk of the make(1) variables which refer to a

program/tool from "FOO" to "TOOL_FOO".  The new variables are:
	TOOL_ASN1_COMPILE  TOOL_CAP_MKDB  TOOL_CAT  TOOL_CKSUM  TOOL_COMPILE_ET
	TOOL_CONFIG  TOOL_CRUNCHGEN  TOOL_CTAGS  TOOL_DB  TOOL_EQN  TOOL_FGEN
	TOOL_GENCAT  TOOL_GROFF  TOOL_HEXDUMP  TOOL_INDXBIB  TOOL_INSTALLBOOT
	TOOL_INSTALL_INFO  TOOL_M4  TOOL_MAKEFS  TOOL_MAKEINFO  TOOL_MAKEWHATIS
	TOOL_MDSETIMAGE  TOOL_MENUC  TOOL_MKCSMAPPER  TOOL_MKESDB
	TOOL_MKLOCALE  TOOL_MKMAGIC  TOOL_MKTEMP  TOOL_MSGC  TOOL_MTREE
	TOOL_PAX  TOOL_PIC  TOOL_PREPMKBOOTIMAGE  TOOL_PWD_MKDB  TOOL_REFER
	TOOL_ROFF_ASCII  TOOL_ROFF_DVI  TOOL_ROFF_HTML  TOOL_ROFF_PS
	TOOL_ROFF_RAW  TOOL_RPCGEN  TOOL_SOELIM  TOOL_SUNLABEL  TOOL_TBL
	TOOL_UUDECODE  TOOL_VGRIND  TOOL_ZIC

For each, provide default in <bsd.sys.mk> of the form:
	TOOL_FOO?=	foo
and for the ${USETOOLS}=="yes" case in <bsd.own.mk>, provide override:
	TOOL_FOO=	${TOOLDIR}/bin/${_TOOL_PREFIX}foo

Document all of these in bsd.README.

This cleans up a chunk of potential (and actual) namespace collision
within our build infrastructure, as well as improves consistency in
the share/mk documentation and provision of appropriate defaults for
each of these variables.

diff --git a/rogue/USD.doc/Makefile b/rogue/USD.doc/Makefile
index 778e98f5f515c07177bc3cc750f4ecc52e8faf95..9a8ef89d5bf8e14080c1a1043dd1d0d0e92e3882 100644 (file)
--- a/rogue/USD.doc/Makefile
+++ b/rogue/USD.doc/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/01/05 12:34:26 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2003/07/10 10:34:19 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/8/93
 
 DIR=   usd/30.rogue
@@ -6,6 +6,6 @@ SRCS=   rogue.me
 MACROS=        -me
 
 paper.${PRINTER}: ${SRCS}
-       ${TBL} ${SRCS} | ${ROFF} ${MACROS} > ${.TARGET}
+       ${TOOL_TBL} ${SRCS} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET}
 
 .include <bsd.doc.mk>

diff --git a/trek/USD.doc/Makefile b/trek/USD.doc/Makefile
index a01b2320ecaeef3b4ba1941d3c29dbbf0e4f039a..f191202c10316801e1bf092e8e9348f86607d5c2 100644 (file)
--- a/trek/USD.doc/Makefile
+++ b/trek/USD.doc/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2003/01/05 12:34:27 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2003/07/10 10:34:20 lukem Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/8/93
 
 DIR=   usd/31.trek
@@ -6,6 +6,6 @@ SRCS=   trek.me
 MACROS=        -me
 
 paper.ps: ${SRCS}
-       ${TBL} ${SRCS} | ${ROFF} ${MACROS} > ${.TARGET}
+       ${TOOL_TBL} ${SRCS} | ${TOOL_ROFF_PS} ${MACROS} > ${.TARGET}
 
 .include <bsd.doc.mk>