diff options
| author | dsl <dsl@pkgsrc.org> | 2008-12-23 22:34:26 +0000 |
|---|---|---|
| committer | dsl <dsl@pkgsrc.org> | 2008-12-23 22:34:26 +0000 |
| commit | 5f2fc5dcbf10ebbd3eef16dcec367c2f7b7395a3 (patch) | |
| tree | 0d9f8c100784ab9cde51ad88eb17a8ed57e24792 /mk/tools | |
| parent | be094f739c0c6d6277ea709f8729fe0ba7f8b6a4 (diff) | |
| download | pkgsrc-5f2fc5dcbf10ebbd3eef16dcec367c2f7b7395a3.tar.gz | |
Use a temporary variable to hold ${_dep_:C/\:.*$//} since it is used
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
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 406a9d94486..87e1fcd3277 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -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 |