diff options
| author | jlam <jlam> | 2005-05-19 05:01:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-19 05:01:47 +0000 |
| commit | f041352c99a04ad783812f5498bc825ec188a05f (patch) | |
| tree | a24681495aa5af3b9c815d223fc4c9e14cd83c00 | |
| parent | 83c3a8966c2813ee014bcf73e1c027aabd6cfafb (diff) | |
| download | pkgsrc-f041352c99a04ad783812f5498bc825ec188a05f.tar.gz | |
Split the conditional which seems to occasionally be malformed. This
probably has something to do with how make deals with short-circuit
evaluation of conditionals, but it's a simple matter to split the
conditional since USE_PERL5 is eventually going away.
| -rw-r--r-- | lang/perl5/buildlink3.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index 55f321912d2..23c5c505da0 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2005/05/19 03:09:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2005/05/19 05:01:47 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ PERL5_BUILDLINK3_MK:= ${PERL5_BUILDLINK3_MK}+ @@ -24,8 +24,10 @@ BUILDLINK_DEPENDS.perl+= {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}} BUILDLINK_RECOMMENDED.perl+= perl>=5.8.5nb6 BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl58 -.if (defined(USE_PERL5) && !empty(USE_PERL5:Mbuild)) || \ - (defined(TOOLS_DEPMETHOD.perl) && !empty(TOOLS_DEPMETHOD.perl:MBUILD_DEPENDS)) +.if defined(USE_PERL5) && !empty(USE_PERL5:Mbuild) +BUILDLINK_DEPMETHOD.perl?= build +.endif +.if defined(TOOLS_DEPMETHOD.perl) && !empty(TOOLS_DEPMETHOD.perl:MBUILD_DEPENDS) BUILDLINK_DEPMETHOD.perl?= build .endif |