[pkgsrc/trunk]: pkgsrc/lang/perl5 Split the conditional which seems to occasi...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9bbc77de95e
branches:  trunk
changeset: 494091:b9bbc77de95e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu May 19 05:01:47 2005 +0000

description:
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.

diffstat:

 lang/perl5/buildlink3.mk |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r e255de09a616 -r b9bbc77de95e lang/perl5/buildlink3.mk
--- a/lang/perl5/buildlink3.mk  Thu May 19 03:58:40 2005 +0000
+++ b/lang/perl5/buildlink3.mk  Thu May 19 05:01:47 2005 +0000
@@ -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_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