diff options
| author | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-18 16:35:27 +0000 |
| commit | c7890c52490439cd19ae66892f2333452441ad2b (patch) | |
| tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /x11/Xrender | |
| parent | 49ae53b8c6feebc5da80ca906891c5a2c359adfc (diff) | |
| download | pkgsrc-c7890c52490439cd19ae66892f2333452441ad2b.tar.gz | |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'x11/Xrender')
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index e077a14f24c..ff677aecef0 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2004/02/17 13:44:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -92,29 +92,31 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender=${BUILDLINK_IS_BUILTIN.Xrender} .endif -.if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES -.else -BUILDLINK_USE_BUILTIN.Xrender= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.Xrender) +. if !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.Xrender= NO -.endif -.if !empty(PREFER_NATIVE:MXrender) && \ - !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES -.endif -.if !empty(PREFER_PKGSRC:MXrender) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:MXrender) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xrender= YES +. endif +. if !empty(PREFER_PKGSRC:MXrender) +BUILDLINK_USE_BUILTIN.Xrender= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[nN][oO]) |