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 /devel/zlib | |
| 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 'devel/zlib')
| -rw-r--r-- | devel/zlib/buildlink3.mk | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/devel/zlib/buildlink3.mk b/devel/zlib/buildlink3.mk index c6175d794bf..c9f47b1d6e7 100644 --- a/devel/zlib/buildlink3.mk +++ b/devel/zlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ ZLIB_BUILDLINK3_MK:= ${ZLIB_BUILDLINK3_MK}+ @@ -69,33 +69,35 @@ BUILDLINK_IS_BUILTIN.zlib!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.zlib=${BUILDLINK_IS_BUILTIN.zlib} .endif -.if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= YES -.else -BUILDLINK_USE_BUILTIN.zlib= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.zlib) +. if !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.zlib= NO -.endif -.if !empty(PREFER_NATIVE:Mzlib) && \ - !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= YES -.endif -.if !empty(PREFER_PKGSRC:Mzlib) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.zlib= NO -.endif - -.if defined(USE_ZLIB) +. endif +. if !empty(PREFER_NATIVE:Mzlib) && \ + !empty(BUILDLINK_IS_BUILTIN.zlib:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.zlib= YES +. endif +. if !empty(PREFER_PKGSRC:Mzlib) BUILDLINK_USE_BUILTIN.zlib= NO -.endif +. endif -.if !empty(BUILDLINK_CHECK_BUILTIN.zlib:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.zlib= YES +. if defined(USE_ZLIB) +BUILDLINK_USE_BUILTIN.zlib= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.zlib:M[nN][oO]) |