diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-18 16:35:27 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-18 16:35:27 +0000 |
| commit | bf6e059da4895ab456eb5a60bfc41a648bc78a2b (patch) | |
| tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /textproc/expat | |
| parent | 2f58d4e75293627c73f9a9e01eab4d65f1069903 (diff) | |
| download | pkgsrc-bf6e059da4895ab456eb5a60bfc41a648bc78a2b.tar.gz | |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'textproc/expat')
| -rw-r--r-- | textproc/expat/buildlink3.mk | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/textproc/expat/buildlink3.mk b/textproc/expat/buildlink3.mk index 6fdb602e5d1..db6d64d3d98 100644 --- a/textproc/expat/buildlink3.mk +++ b/textproc/expat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 10:55:02 recht Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ EXPAT_BUILDLINK3_MK:= ${EXPAT_BUILDLINK3_MK}+ @@ -61,29 +61,31 @@ BUILDLINK_IS_BUILTIN.expat!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.expat=${BUILDLINK_IS_BUILTIN.expat} .endif -.if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.else -BUILDLINK_USE_BUILTIN.expat= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.expat) +. if !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.expat= NO -.endif -.if !empty(PREFER_NATIVE:Mexpat) && \ - !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES -.endif -.if !empty(PREFER_PKGSRC:Mexpat) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.expat:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mexpat) && \ + !empty(BUILDLINK_IS_BUILTIN.expat:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.expat= YES +. endif +. if !empty(PREFER_PKGSRC:Mexpat) +BUILDLINK_USE_BUILTIN.expat= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.expat:M[nN][oO]) |