From 742c2a029d42bd3d6a25ae52cd1a00754ec6bd67 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 15 Nov 2004 18:01:58 +0000 Subject: Store the actual library options in BUILDLINK_LDADD.db1 and append that to BUILDLINK_LIBS.db1. This ensures that BUILDLINK_LDADD.${BDB_TYPE} always resolves to the correct library options. --- mk/db1.builtin.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mk/db1.builtin.mk') diff --git a/mk/db1.builtin.mk b/mk/db1.builtin.mk index dee2f8cf3cd..49f30cb720f 100644 --- a/mk/db1.builtin.mk +++ b/mk/db1.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: db1.builtin.mk,v 1.1 2004/11/15 17:54:49 jlam Exp $ +# $NetBSD: db1.builtin.mk,v 1.2 2004/11/15 18:01:58 jlam Exp $ .for _lib_ in db db1 . if !defined(_BLNK_LIB_FOUND.${_lib_}) @@ -62,11 +62,12 @@ BUILDLINK_INCDIRS.db1= include BUILDLINK_INCDIRS.db1= include/db1 . endif . if !empty(_BLNK_LIB_FOUND.db:M[yY][eE][sS]) -BUILDLINK_LIBS.db1= -ldb +BUILDLINK_LDADD.db1= -ldb . endif . if !empty(_BLNK_LIB_FOUND.db1:M[yY][eE][sS]) -BUILDLINK_LIBS.db1= -ldb1 +BUILDLINK_LDADD.db1= -ldb1 BUILDLINK_TRANSFORM+= l:db:db1 . endif +BUILDLINK_LIBS.db1= ${BUILDLINK_LDADD.db1} . endif # USE_BUILTIN.db1 == yes .endif # CHECK_BUILTIN.db1 -- cgit v1.2.3