pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Avoid trailing spaces in TOOLS_<TOOL> values ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/af1c9dafb71e
branches:  trunk
changeset: 496999:af1c9dafb71e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Jul 18 21:40:55 2005 +0000

description:
Avoid trailing spaces in TOOLS_<TOOL> values if TOOLS_ARGS.* is empty.

diffstat:

 mk/tools/replace.mk |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r bbef12b4f0ca -r af1c9dafb71e mk/tools/replace.mk
--- a/mk/tools/replace.mk       Mon Jul 18 21:33:24 2005 +0000
+++ b/mk/tools/replace.mk       Mon Jul 18 21:40:55 2005 +0000
@@ -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 @@
 ### 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



Home | Main Index | Thread Index | Old Index