diff options
| author | jlam <jlam> | 2005-07-18 21:40:55 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-07-18 21:40:55 +0000 |
| commit | 54de08a3bef36923af1197a8b0af6557900ff57c (patch) | |
| tree | 6173c196ae1728e90bfa31f9ed39ce21788e04a1 /mk | |
| parent | 3ab3cafa40d80a3ed31a05245331724b3a6a56ab (diff) | |
| download | pkgsrc-54de08a3bef36923af1197a8b0af6557900ff57c.tar.gz | |
Avoid trailing spaces in TOOLS_<TOOL> values if TOOLS_ARGS.* is empty.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 8747eb4081e..eb6e3191d7b 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.117 2005/07/18 02:33:27 jlam Exp $ +# $NetBSD: replace.mk,v 1.118 2005/07/18 21:40:55 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -1174,8 +1174,12 @@ TOOLS_ARGS.${_t_}?= \ ### For each tool, TOOLS_CMDLINE.<tool> is the full command (path and ### arguments) that should be run to properly execute the tool. ### -. if defined(TOOLS_PATH.${_t_}) +. if defined(TOOLS_PATH.${_t_}) && !empty(TOOLS_PATH.${_t_}) +. if defined(TOOLS_ARGS.${_t_}) && !empty(TOOLS_ARGS.${_t_}) TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}} ${TOOLS_ARGS.${_t_}} +. else +TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}} +. endif . endif ### ### If a "TOOL" name is associated with the tool, then export two |