summaryrefslogtreecommitdiff
path: root/converters
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 /converters
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 'converters')
-rw-r--r--converters/libiconv/buildlink3.mk40
1 files changed, 21 insertions, 19 deletions
diff --git a/converters/libiconv/buildlink3.mk b/converters/libiconv/buildlink3.mk
index d53caccf703..100ea810a8c 100644
--- a/converters/libiconv/buildlink3.mk
+++ b/converters/libiconv/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:06 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2004/02/18 16:35:27 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
ICONV_BUILDLINK3_MK:= ${ICONV_BUILDLINK3_MK}+
@@ -30,33 +30,35 @@ BUILDLINK_IS_BUILTIN.iconv= NO
. endif
.endif
-.if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.iconv= YES
-.else
-BUILDLINK_USE_BUILTIN.iconv= NO
.endif
-.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
- !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+.if !defined(BUILDLINK_USE_BUILTIN.iconv)
+. if !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.iconv= YES
-.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+. else
BUILDLINK_USE_BUILTIN.iconv= NO
-.endif
-.if !empty(PREFER_NATIVE:Miconv) && \
- !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+. endif
+
+. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.iconv= YES
-.endif
-.if !empty(PREFER_PKGSRC:Miconv)
+. endif
+. if !empty(PREFER_PKGSRC:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.iconv= NO
-.endif
-
-.if defined(USE_GNU_ICONV)
+. endif
+. if !empty(PREFER_NATIVE:Miconv) && \
+ !empty(BUILDLINK_IS_BUILTIN.iconv:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.iconv= YES
+. endif
+. if !empty(PREFER_PKGSRC:Miconv)
BUILDLINK_USE_BUILTIN.iconv= NO
-.endif
+. endif
-.if !empty(BUILDLINK_CHECK_BUILTIN.iconv:M[yY][eE][sS])
-BUILDLINK_USE_BUILTIN.iconv= YES
+. if defined(USE_GNU_ICONV)
+BUILDLINK_USE_BUILTIN.iconv= NO
+. endif
.endif
.if !empty(BUILDLINK_USE_BUILTIN.iconv:M[nN][oO])