diff options
| author | rillig <rillig@pkgsrc.org> | 2007-09-10 07:25:14 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-09-10 07:25:14 +0000 |
| commit | 6780484224ccd5eab97e2f413e0abdddcf9abb3e (patch) | |
| tree | f8dc4e115739372452b1ca6745b502a972c708e4 /mk | |
| parent | cd03ea87b2d33090fa4cbc95f6683919b5aee856 (diff) | |
| download | pkgsrc-6780484224ccd5eab97e2f413e0abdddcf9abb3e.tar.gz | |
Reverted the last change. Apparently, it was committed without testing
it first.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 84d60518fd9..ce0d3b958cd 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.197 2007/09/10 07:00:37 rillig Exp $ +# $NetBSD: replace.mk,v 1.198 2007/09/10 07:25:14 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -141,23 +141,43 @@ _TOOLS_DEPMETHOD.${_t_:C/:.*//}= BUILD_DEPENDS _TOOLS_DEPMETHOD.${_t_:C/:.*//}= DEPENDS .endfor -.for pair in \ - bison-yacc:yacc \ - flex:lex \ - gawk:awk \ - gm4:m4 \ - gsed:sed \ - gsoelim:soelim -. for first in ${pair:C/:.*//} -. for second in ${pair:C/.*://} -. if !empty(_USE_TOOLS:M${first}) -. if (${_TOOLS_DEPMETHOD.${first}} == "BUILD_DEPENDS") && defined(_TOOLS_DEPMETHOD.${second}) -_TOOLS_DEPMETHOD.${first}= ${_TOOLS_DEPMETHOD.${second}} -. endif -. endif -. endfor -. endfor -.endfor +.if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc +. if defined(_TOOLS_DEPMETHOD.bison-yacc) && \ + (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.yacc) +_TOOLS_DEPMETHOD.bison-yacc= ${_TOOLS_DEPMETHOD.yacc} +. endif +.endif +.if !empty(_USE_TOOLS:Mflex) # flex > lex +. if (${_TOOLS_DEPMETHOD.flex} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.lex) +_TOOLS_DEPMETHOD.flex= ${_TOOLS_DEPMETHOD.lex} +. endif +.endif +.if !empty(_USE_TOOLS:Mgawk) # gawk > awk +. if (${_TOOLS_DEPMETHOD.gawk} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.awk) +_TOOLS_DEPMETHOD.gawk= ${_TOOLS_DEPMETHOD.awk} +. endif +.endif +.if !empty(_USE_TOOLS:Mgm4) # gm4 > m4 +. if (${_TOOLS_DEPMETHOD.gm4} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.m4) +_TOOLS_DEPMETHOD.gm4= ${_TOOLS_DEPMETHOD.m4} +. endif +.endif +.if !empty(_USE_TOOLS:Mgsed) # gsed > sed +. if (${_TOOLS_DEPMETHOD.gsed} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.sed) +_TOOLS_DEPMETHOD.gsed= ${_TOOLS_DEPMETHOD.sed} +. endif +.endif +.if !empty(_USE_TOOLS:Mgsoelim) # gsoelim > soelim +. if (${_TOOLS_DEPMETHOD.gsoelim} == "BUILD_DEPENDS") && \ + defined(_TOOLS_DEPMETHOD.soelim) +_TOOLS_DEPMETHOD.gsoelim= ${_TOOLS_DEPMETHOD.soelim} +. endif +.endif ###################################################################### |