diff options
| author | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
| commit | ff939e0dc77366add1742d37d4ed3fb8f9a9aba1 (patch) | |
| tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /net | |
| parent | 46884894e5707d65635b725e008cf5fe441040cd (diff) | |
| download | pkgsrc-ff939e0dc77366add1742d37d4ed3fb8f9a9aba1.tar.gz | |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'net')
| -rw-r--r-- | net/libpcap/buildlink3.mk | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/net/libpcap/buildlink3.mk b/net/libpcap/buildlink3.mk index d0a036491d9..8acb18903c7 100644 --- a/net/libpcap/buildlink3.mk +++ b/net/libpcap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBPCAP_BUILDLINK3_MK:= ${LIBPCAP_BUILDLINK3_MK}+ @@ -20,29 +20,31 @@ BUILDLINK_IS_BUILTIN.libpcap= YES . endif .endif -.if !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES -.else -BUILDLINK_USE_BUILTIN.libpcap= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.libpcap) +. if !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.libpcap= NO -.endif -.if !empty(PREFER_NATIVE:Mlibpcap) && \ - !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES -.endif -.if !empty(PREFER_PKGSRC:Mlibpcap) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.libpcap:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mlibpcap) && \ + !empty(BUILDLINK_IS_BUILTIN.libpcap:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.libpcap= YES +. endif +. if !empty(PREFER_PKGSRC:Mlibpcap) +BUILDLINK_USE_BUILTIN.libpcap= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.libpcap:M[nN][oO]) |