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 | 856c7ef8b5bf784559d087397ad7cccf45177200 (patch) | |
| tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /fonts/Xft2 | |
| parent | e1720521d0a3d72d0677c724d4ea47c2f900ba11 (diff) | |
| download | pkgsrc-856c7ef8b5bf784559d087397ad7cccf45177200.tar.gz | |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'fonts/Xft2')
| -rw-r--r-- | fonts/Xft2/buildlink3.mk | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 64bf108ebba..3b72cb9dad6 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/02/17 16:48:45 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -90,29 +90,31 @@ BUILDLINK_IS_BUILTIN.Xft2!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xft2=${BUILDLINK_IS_BUILTIN.Xft2} .endif -.if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.else -BUILDLINK_USE_BUILTIN.Xft2= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.Xft2) +. if !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.Xft2= NO -.endif -.if !empty(PREFER_NATIVE:MXft2) && \ - !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES -.endif -.if !empty(PREFER_PKGSRC:MXft2) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= NO -.endif - -.if !empty(BUILDLINK_CHECK_BUILTIN.Xft2:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:MXft2) && \ + !empty(BUILDLINK_IS_BUILTIN.Xft2:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.Xft2= YES +. endif +. if !empty(PREFER_PKGSRC:MXft2) +BUILDLINK_USE_BUILTIN.Xft2= NO +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.Xft2:M[nN][oO]) |