diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
commit | 317cc72791f8dcfcdd50f770e1ae9ccce68ddb47 (patch) | |
tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /devel/binutils | |
parent | e7133cac25a67cadb35ea338f0d9924c2a9da764 (diff) | |
download | pkgsrc-317cc72791f8dcfcdd50f770e1ae9ccce68ddb47.tar.gz |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'devel/binutils')
-rw-r--r-- | devel/binutils/buildlink2.mk | 8 | ||||
-rw-r--r-- | devel/binutils/buildlink3.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/devel/binutils/buildlink2.mk b/devel/binutils/buildlink2.mk index 5ab21aef507..557209477f9 100644 --- a/devel/binutils/buildlink2.mk +++ b/devel/binutils/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.12 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.13 2004/02/05 07:17:14 jlam Exp $ .if !defined(BINUTILS_BUILDLINK2_MK) BINUTILS_BUILDLINK2_MK= # defined @@ -31,11 +31,9 @@ _NEED_BINUTILS= YES . endfor .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbinutils) _NEED_BINUTILS= YES -. endif .endif .if ${_NEED_BINUTILS} == "YES" diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index 46d803f9743..c5aad2b4866 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BINUTILS_BUILDLINK3_MK:= ${BINUTILS_BUILDLINK3_MK}+ @@ -18,11 +18,9 @@ BUILDLINK_CHECK_BUILTIN.binutils?= NO BUILDLINK_IS_BUILTIN.binutils= YES .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mbinutils) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mbinutils) BUILDLINK_USE_BUILTIN.binutils= NO -. endif .endif .if defined(USE_BINUTILS) |