diff options
| author | jlam <jlam> | 2005-04-26 18:59:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-26 18:59:48 +0000 |
| commit | 6e4afab2f66d13ad597f8299c7cd6260972190d6 (patch) | |
| tree | dcfe8bc86e52983d048dc914995898e6af18135d /mk | |
| parent | 5754cb0255f44b5c6affd25a0aaeb6e1d85ebc76 (diff) | |
| download | pkgsrc-6e4afab2f66d13ad597f8299c7cd6260972190d6.tar.gz | |
Only set the "TOOL" variable if it was associated with the corresponding
<tool>.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index e76dc591920..af69d5759bf 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.16 2005/04/26 16:19:37 jlam Exp $ +# $NetBSD: replace.mk,v 1.17 2005/04/26 18:59:48 jlam Exp $ # # This Makefile fragment handles "replacements" of system-supplied # tools with pkgsrc versions. The replacements are placed under @@ -373,7 +373,8 @@ ${_TOOLS_VARNAME.yacc}= ${TOOLS_REAL_CMD.yacc} ${TOOLS_ARGS.yacc} # there are any arguments or not. If PLATFORM_TOOL.<tool> is undefined # or emtpy, then we fall back to checking if TOOL is defined. Lastly, # always set the TOOL name for each tool to point to the real command, -# e.g., TBL, YACC, etc. +# e.g., TBL, YACC, etc., provided that "TOOL" has been associated with +# <tool>. # .for _t_ in ${_TOOLS_REPLACE_LIST} . if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:M${_t_}) && \ @@ -399,10 +400,12 @@ TOOLS_WRAP+= ${_t_} . else TOOLS_SYMLINK+= ${_t_} . endif -. elif defined(TOOLS_REAL_CMD.${_t_}) +. elif defined(_TOOLS_VARNAME.${_t_}) +. if defined(TOOLS_REAL_CMD.${_t_}) ${_TOOLS_VARNAME.${_t_}}= ${TOOLS_REAL_CMD.${_t_}} ${TOOLS_ARGS.${_t_}} -. else +. else ${_TOOLS_VARNAME.${_t_}}= ${_TOOLS_VARNAME.${_t_}}_not_defined_ +. endif . endif . endif .endfor |