From e7133cac25a67cadb35ea338f0d9924c2a9da764 Mon Sep 17 00:00:00 2001 From: jlam Date: Thu, 5 Feb 2004 07:06:15 +0000 Subject: Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its value outside of buildlink-related files. --- databases/db/buildlink2.mk | 9 ++++----- databases/db/buildlink3.mk | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'databases') diff --git a/databases/db/buildlink2.mk b/databases/db/buildlink2.mk index 356b3e68f74..19ee559b856 100644 --- a/databases/db/buildlink2.mk +++ b/databases/db/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.10 2004/02/05 06:58:02 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.11 2004/02/05 07:06:15 jlam Exp $ .if !defined(DB_BUILDLINK2_MK) DB_BUILDLINK2_MK= # defined @@ -35,10 +35,9 @@ _NEED_DB2= NO . endif .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mdb) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mdb) _NEED_DB2= YES . endif .endif diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index ef24887b2ce..fe0d69f34e9 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 06:58:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB2_BUILDLINK3_MK:= ${DB2_BUILDLINK3_MK}+ @@ -9,10 +9,9 @@ BUILDLINK_DEPENDS.db+= db>=2.7.3 BUILDLINK_PKGSRCDIR.db?= ../../databases/db .endif # DB2_BUILDLINK3_MK -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:Mdb) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:Mdb) BUILDLINK_USE_BUILTIN.db= NO . endif .endif -- cgit v1.2.3