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 /x11/xcursor | |
| 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 'x11/xcursor')
| -rw-r--r-- | x11/xcursor/buildlink3.mk | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index eb4b52b6630..970f07eb7a8 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 16:27:54 jmmv Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -54,29 +54,31 @@ BUILDLINK_IS_BUILTIN.xcursor!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.xcursor=${BUILDLINK_IS_BUILTIN.xcursor} .endif -.if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.else -BUILDLINK_USE_BUILTIN.xcursor= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.xcursor) +. if !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.xcursor= NO -.endif -.if !empty(PREFER_NATIVE:Mxcursor) && \ - !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES -.endif -.if !empty(PREFER_PKGSRC:Mxcursor) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mxcursor) && \ + !empty(BUILDLINK_IS_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.xcursor= YES +. endif +. if !empty(PREFER_PKGSRC:Mxcursor) +BUILDLINK_USE_BUILTIN.xcursor= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[nN][oO]) |