summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2005-07-21 02:54:51 +0000
committerjlam <jlam>2005-07-21 02:54:51 +0000
commitf26407cd44b83d15acf64af1e15c9422192d3e8b (patch)
treec44e2235590f34ab046712a0894b0fa81e1d1355 /mk
parent0fc9db77902b2d68f7ff3984d0aac3bcd666e245 (diff)
downloadpkgsrc-f26407cd44b83d15acf64af1e15c9422192d3e8b.tar.gz
databases/db/buildlink3.mk was changed a long, long time ago to use
"db2" as the "BUILDLINK_PACKAGES" variable. Drop the use of _BDB_PKGBASE.*. This fixes the settings for BDBBASE and BDB_LIBS if BDB_DEFAULT is "db2".
Diffstat (limited to 'mk')
-rw-r--r--mk/bdb.buildlink3.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk
index 788401d2858..88e531dff93 100644
--- a/mk/bdb.buildlink3.mk
+++ b/mk/bdb.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.13 2005/01/09 23:56:21 jlam Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.14 2005/07/21 02:54:51 jlam Exp $
#
# This Makefile fragment is meant to be included by packages that
# require a Berkeley DB implementation. bdb.buildlink3.mk will:
@@ -62,10 +62,8 @@ BDB185_DEFAULT?= db1
BDB185_DEFAULT?= ${BDB_DEFAULT}
. endif
-_BDB_PKGBASE.db2= db
_BDB_PKGSRCDIR.db2= ../../databases/db
. for _bdb_ in ${_BDB_PKGS}
-_BDB_PKGBASE.${_bdb_}?= ${_bdb_}
_BDB_PKGSRCDIR.${_bdb_}?= ../../databases/${_bdb_}
. endfor
@@ -88,8 +86,8 @@ BDB_TYPE= none
. endif
# Define some public variables to refer to package-specific variables.
-BDBBASE= ${BUILDLINK_PREFIX.${_BDB_PKGBASE.${BDB_TYPE}}}
-BDB_LIBS= ${BUILDLINK_LDADD.${_BDB_PKGBASE.${BDB_TYPE}}}
+BDBBASE= ${BUILDLINK_PREFIX.${BDB_TYPE}}
+BDB_LIBS= ${BUILDLINK_LDADD.${BDB_TYPE}}
BUILD_DEFS+= BDB_TYPE
BUILD_DEFS+= BDBBASE