From 6d89d6f4106926acd6543fd9988c1f9bacf5858e Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 6 Mar 2004 14:38:01 +0000 Subject: Do previous in a different way by providing a default value for USE_BUILTIN. before it is checked. _BLNK_PACKAGES isn't strictly a superset of _BLNK_DEPENDS due to the special x11-links handling which should eventually be removed altogether. --- mk/buildlink3/bsd.buildlink3.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mk/buildlink3') diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 2af20adf595..b1a1ca105dc 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.103 2004/03/06 09:46:05 xtraeme Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.104 2004/03/06 14:38:01 jlam Exp $ # # An example package buildlink3.mk file: # @@ -123,8 +123,8 @@ _BLNK_PACKAGES+= ${_pkg_} # _BLNK_DEPENDS= # empty .for _pkg_ in ${BUILDLINK_DEPENDS} -. if empty(_BLNK_DEPENDS:M${_pkg_}) && (defined(USE_BUILTIN.${_pkg_}) && \ - !empty(USE_BUILTIN.${_pkg_}:M[nN][oO])) +USE_BUILTIN.${_pkg_}?= no +. if empty(_BLNK_DEPENDS:M${_pkg_}) && !empty(USE_BUILTIN.${_pkg_}:M[nN][oO]) _BLNK_DEPENDS+= ${_pkg_} . endif .endfor -- cgit v1.2.3