summaryrefslogtreecommitdiff
path: root/fonts/fontconfig/buildlink3.mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-18 16:35:27 +0000
committerjlam <jlam@pkgsrc.org>2004-02-18 16:35:27 +0000
commitbf6e059da4895ab456eb5a60bfc41a648bc78a2b (patch)
treedaac6b8473ed3f39f2dec5295d64812df616c1e4 /fonts/fontconfig/buildlink3.mk
parent2f58d4e75293627c73f9a9e01eab4d65f1069903 (diff)
downloadpkgsrc-bf6e059da4895ab456eb5a60bfc41a648bc78a2b.tar.gz
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'fonts/fontconfig/buildlink3.mk')
-rw-r--r--fonts/fontconfig/buildlink3.mk34
1 files changed, 18 insertions, 16 deletions
diff --git a/fonts/fontconfig/buildlink3.mk b/fonts/fontconfig/buildlink3.mk
index 11f198032be..f1042c82f02 100644
--- a/fonts/fontconfig/buildlink3.mk
+++ b/fonts/fontconfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/18 14:58:37 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/18 16:35:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
FONTCONFIG_BUILDLINK3_MK:= ${FONTCONFIG_BUILDLINK3_MK}+
@@ -64,29 +64,31 @@ MAKEFLAGS+= \
BUILDLINK_IS_BUILTIN.fontconfig=${BUILDLINK_IS_BUILTIN.fontconfig}
.endif
-.if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.fontconfig= YES
-.else
-BUILDLINK_USE_BUILTIN.fontconfig= NO
.endif
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
- !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.fontconfig)
+. if !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.fontconfig= YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+. else
BUILDLINK_USE_BUILTIN.fontconfig= NO
-.endif
-.if !empty(PREFER_NATIVE:Mfontconfig) && \
- !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
+. endif
+
+. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.fontconfig= YES
-.endif
-.if !empty(PREFER_PKGSRC:Mfontconfig)
+. endif
+. if !empty(PREFER_PKGSRC:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.fontconfig= NO
-.endif
-
-.if !empty(BUILDLINK_CHECK_BUILTIN.fontconfig:M[yY][eE][sS])
+. endif
+. if !empty(PREFER_NATIVE:Mfontconfig) && \
+ !empty(BUILDLINK_IS_BUILTIN.fontconfig:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.fontconfig= YES
+. endif
+. if !empty(PREFER_PKGSRC:Mfontconfig)
+BUILDLINK_USE_BUILTIN.fontconfig= NO
+. endif
.endif
.if !empty(BUILDLINK_USE_BUILTIN.fontconfig:M[nN][oO])