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 | bf6e059da4895ab456eb5a60bfc41a648bc78a2b (patch) | |
| tree | daac6b8473ed3f39f2dec5295d64812df616c1e4 /devel/ncurses | |
| parent | 2f58d4e75293627c73f9a9e01eab4d65f1069903 (diff) | |
| download | pkgsrc-bf6e059da4895ab456eb5a60bfc41a648bc78a2b.tar.gz | |
Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
Diffstat (limited to 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index f34004151d5..ecca05c1389 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2004/02/17 16:02:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2004/02/18 16:35:27 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -91,36 +91,38 @@ BUILDLINK_IS_BUILTIN.ncurses= NO MAKEFLAGS+= BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses} .endif -.if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= YES -.else -BUILDLINK_USE_BUILTIN.ncurses= NO .endif -.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ - !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +.if !defined(BUILDLINK_USE_BUILTIN.ncurses) +. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= YES -.endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +. else BUILDLINK_USE_BUILTIN.ncurses= NO -.endif -.if !empty(PREFER_NATIVE:Mncurses) && \ - !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +. endif + +. if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= YES -.endif -.if !empty(PREFER_PKGSRC:Mncurses) +. endif +. if !empty(PREFER_PKGSRC:M[yY][eE][sS]) BUILDLINK_USE_BUILTIN.ncurses= NO -.endif - -.if defined(USE_NCURSES) -. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \ - !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS]) +. endif +. if !empty(PREFER_NATIVE:Mncurses) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= YES +. endif +. if !empty(PREFER_PKGSRC:Mncurses) BUILDLINK_USE_BUILTIN.ncurses= NO . endif -.endif -.if !empty(BUILDLINK_CHECK_BUILTIN.ncurses:M[yY][eE][sS]) -BUILDLINK_USE_BUILTIN.ncurses= YES +. if defined(USE_NCURSES) +. if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) && \ + !empty(_BLNK_LIBNCURSES_FOUND:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= NO +. endif +. endif .endif .if !empty(BUILDLINK_USE_BUILTIN.ncurses:M[nN][oO]) |