diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-02 21:03:32 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-02 21:03:32 +0000 |
| commit | 493a44f92625a5d3054ac237993a7e84b7f7f786 (patch) | |
| tree | d7242efd9719a79697280e0f56c75611f8734458 /mk | |
| parent | d11c52dea5a3e4633acda17ef4143f84806f3b2d (diff) | |
| download | pkgsrc-493a44f92625a5d3054ac237993a7e84b7f7f786.tar.gz | |
Back out previous change, and correct the surrounding check -- we need
to see if _USE_TOOLS contains "perl", not USE_TOOLS.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 56b3c6c0bab..67280276a71 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.96 2005/06/02 09:31:25 tron Exp $ +# $NetBSD: replace.mk,v 1.97 2005/06/02 21:03:32 jlam Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -809,11 +809,10 @@ TOOLS_${_TOOLS_VARNAME.pax}= ${TOOLS_REAL_CMD.pax} . endif .endif -.if !defined(TOOLS_IGNORE.perl) && !empty(USE_TOOLS:Mperl) +.if !defined(TOOLS_IGNORE.perl) && !empty(_USE_TOOLS:Mperl) . if !empty(PKGPATH:Mlang/perl58) MAKEFLAGS+= TOOLS_IGNORE.perl= -. elif defined(_TOOLS_USE_PKGSRC.perl) && \ - !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS]) +. elif !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS]) . include "../../lang/perl5/version.mk" TOOLS_DEPENDS.perl?= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl58 TOOLS_CREATE+= perl |