diff options
Diffstat (limited to 'mk/tools/bsd.tools.mk')
| -rw-r--r-- | mk/tools/bsd.tools.mk | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk index b10eae1b30f..ef0e7f34259 100644 --- a/mk/tools/bsd.tools.mk +++ b/mk/tools/bsd.tools.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.tools.mk,v 1.29 2005/06/11 05:22:03 jlam Exp $ +# $NetBSD: bsd.tools.mk,v 1.30 2005/07/17 21:36:24 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -53,24 +53,23 @@ # TOOLS_ALIASES.<tool> is a whitespace-separated list of names for # which <tool> should also be created under ${TOOLS_DIR}. # -# TOOLS_REAL_CMD.<tool> is the path to the actual command that is +# TOOLS_PATH.<tool> is the path to the actual command that is # invoked when ${TOOLS_CMD.<tool>} is called. If <tool> should # be a symlink, then this variable is required and should be a # full path. If <tool> should be a wrapper, then this variable -# is required unless TOOLS_REAL_CMDLINE.<tool> is defined (see -# below). +# is required unless TOOLS_CMDLINE.<tool> is defined (see below). # # The following variables specify further details of each <tool> and # if set, cause a wrapper script to be created. # -# TOOLS_REAL_ARGS.<tool> additional arguments that are passed to the -# real command ahead of any command-line arguments. This variable -# is optional. +# TOOLS_ARGS.<tool> additional arguments that are passed to the real +# command ahead of any command-line arguments. This variable is +# optional. # -# TOOLS_REAL_CMDLINE.<tool> specifies the full command-line to invoke -# in the wrapper script when <tool> is called. This variable is +# TOOLS_CMDLINE.<tool> specifies the full command-line to invoke in +# the wrapper script when <tool> is called. This variable is # optional, and if left unspecified, then this is built up from -# TOOLS_REAL_CMD.<tool> and TOOLS_REAL_ARGS.<tool> by default. +# TOOLS_PATH.<tool> and TOOLS_ARGS.<tool> by default. # # The following variables provide shortcuts for creating certain classes # of tools: @@ -123,18 +122,18 @@ USE_TOOLS?= # empty .for _t_ in ${TOOLS_NOOP} TOOLS_CREATE+= ${_t_} -TOOLS_REAL_CMDLINE.${_t_}?= exit 0 +TOOLS_CMDLINE.${_t_}?= exit 0 .endfor .for _t_ in ${TOOLS_BROKEN} TOOLS_CREATE+= ${_t_} -TOOLS_REAL_CMDLINE.${_t_}?= exit 1 +TOOLS_CMDLINE.${_t_}?= exit 1 .endfor .for _t_ in ${TOOLS_GNU_MISSING} TOOLS_CREATE+= ${_t_} -TOOLS_REAL_CMD.${_t_}?= ${PKGSRCDIR}/mk/gnu-config/missing -TOOLS_REAL_CMDLINE.${_t_}?= ${TOOLS_REAL_CMD.${_t_}} ${_t_:T:C/-[0-9].*$//} +TOOLS_PATH.${_t_}?= ${PKGSRCDIR}/mk/gnu-config/missing +TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}} ${_t_:T:C/-[0-9].*$//} .endfor ###################################################################### @@ -161,14 +160,14 @@ MKDIR?= mkdir -p # and will be called <tool>. # # The default wrapper script will invoke the real command, followed -# by any arguments specified in TOOLS_REAL_ARGS.*, followed by any +# by any arguments specified in TOOLS_ARGS.*, followed by any # command-line arguments passed to the wrapper script. # .for _t_ in ${TOOLS_CREATE} TOOLS_CMD.${_t_}?= ${TOOLS_DIR}/bin/${_t_} -TOOLS_REAL_CMD.${_t_}?= ${FALSE} -TOOLS_REAL_CMDLINE_DFLT.${_t_}= \ - ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}} "$$@" +TOOLS_PATH.${_t_}?= ${FALSE} +TOOLS_CMDLINE_DFLT.${_t_}= \ + ${TOOLS_PATH.${_t_}} ${TOOLS_ARGS.${_t_}} "$$@" override-tools: ${TOOLS_CMD.${_t_}} @@ -176,18 +175,18 @@ ${TOOLS_CMD.${_t_}}: ${_PKG_SILENT}${_PKG_DEBUG}${TEST} -d ${.TARGET:H:Q} || \ ${MKDIR} ${.TARGET:H:Q} ${_PKG_SILENT}${_PKG_DEBUG} \ - if ${TEST} -n ${TOOLS_REAL_CMDLINE.${_t_}:Q}""; then \ + if ${TEST} -n ${TOOLS_CMDLINE.${_t_}:Q}""; then \ create=wrapper; \ - cmdline=${TOOLS_REAL_CMDLINE.${_t_}:Q}; \ - elif ${TEST} -n ${TOOLS_REAL_CMD.${_t_}:Q}""; then \ - if ${TEST} -n ${TOOLS_REAL_ARGS.${_t_}:Q}""; then \ + cmdline=${TOOLS_CMDLINE.${_t_}:Q}; \ + elif ${TEST} -n ${TOOLS_PATH.${_t_}:Q}""; then \ + if ${TEST} -n ${TOOLS_ARGS.${_t_}:Q}""; then \ create=wrapper; \ - cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \ + cmdline=${TOOLS_CMDLINE_DFLT.${_t_}:Q}; \ else \ - case ${TOOLS_REAL_CMD.${_t_}:Q}"" in \ + case ${TOOLS_PATH.${_t_}:Q}"" in \ /*) create=symlink ;; \ *) create=wrapper; \ - cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \ + cmdline=${TOOLS_CMDLINE_DFLT.${_t_}:Q}; \ esac; \ fi; \ else \ @@ -204,7 +203,7 @@ ${TOOLS_CMD.${_t_}}: ${CHMOD} +x ${.TARGET:Q}; \ ;; \ *) \ - ${LN} -fs ${TOOLS_REAL_CMD.${_t_}:Q} ${.TARGET:Q}; \ + ${LN} -fs ${TOOLS_PATH.${_t_}:Q} ${.TARGET:Q}; \ ;; \ esac . for _a_ in ${TOOLS_ALIASES.${_t_}} |