diff options
| author | jlam <jlam> | 2005-06-20 05:44:17 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-06-20 05:44:17 +0000 |
| commit | 6d3683402d4c2f125c2da25eb095888fe172d85c (patch) | |
| tree | 7c385ca791911ce414b9b500d44014e01365a118 | |
| parent | 4249e329f4506311e0d5219594a73ce1bd34014c (diff) | |
| download | pkgsrc-6d3683402d4c2f125c2da25eb095888fe172d85c.tar.gz | |
Allow for explicit PREFER.<pkg> settings to override PREFER_NATIVE and
PREFER_PKGSRC.
| -rw-r--r-- | mk/buildlink3/bsd.builtin.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/buildlink3/bsd.builtin.mk b/mk/buildlink3/bsd.builtin.mk index 97893e248b3..e3eea895d45 100644 --- a/mk/buildlink3/bsd.builtin.mk +++ b/mk/buildlink3/bsd.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.builtin.mk,v 1.5 2005/06/01 18:03:06 jlam Exp $ +# $NetBSD: bsd.builtin.mk,v 1.6 2005/06/20 05:44:17 jlam Exp $ # # Copyright (c) 2004-2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -133,19 +133,20 @@ # or in both variables, then PREFER_PKGSRC has precedence over # PREFER_NATIVE. # -PREFER.${_pkg_}?= pkgsrc +_BLTN_PREFER.${_pkg_}= pkgsrc . if !empty(PREFER_NATIVE:M[yY][eE][sS]) -PREFER.${_pkg_}= native +_BLTN_PREFER.${_pkg_}= native . endif . if !empty(PREFER_PKGSRC:M[yY][eE][sS]) -PREFER.${_pkg_}= pkgsrc +_BLTN_PREFER.${_pkg_}= pkgsrc . endif . if !empty(PREFER_NATIVE:M${_pkg_}) -PREFER.${_pkg_}= native +_BLTN_PREFER.${_pkg_}= native . endif . if !empty(PREFER_PKGSRC:M${_pkg_}) -PREFER.${_pkg_}= pkgsrc +_BLTN_PREFER.${_pkg_}= pkgsrc . endif +PREFER.${_pkg_}?= ${_BLTN_PREFER.${_pkg_}} .endfor .include "../../mk/buildlink3/find-libs.mk" |