kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use a temporary variable to hold ${_dep_:C/\:.*$//} since it is used

Browse source 
as a modifier on another variable and would need to be escaped
as :M${_dep_\:C/\\\:.*$//} in order for the modifiers to be parsed correctly.
This all used to work because _dep_ is a .for loop control variable which
was substituted in an earlier pass through the line.
Recent changes leave .for loop control variables to be substituted during
normal expansion.
Adding the \ would leave the script non-working with theolder make.

OK'd by Beefy
This commit is contained in:
dsl 2008-12-23 22:34:26 +00:00
parent be094f739c
commit 5f2fc5dcbf
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mk/tools/replace.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: replace.mk,v 1.216 2008/12/15 12:53:28 rillig Exp $
# $NetBSD: replace.mk,v 1.217 2008/12/23 22:34:26 dsl Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@ -1249,7 +1249,8 @@ FIND_PREFIX:= ${TOOLS_FIND_PREFIX}
#####
. if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
. for _dep_ in ${TOOLS_DEPENDS.${_t_}}
. if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
_dep_test := ${_dep_:C/\:.*$//}
. if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_test})
${_TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
. endif
. endfor