From 6ae0f5c2f93a5bad69798e36877a83d8e4ab0687 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 24 Aug 2004 00:27:13 +0000 Subject: Process RECOMMENDED *after* including bsd.buildlink3.mk; else it has no real effect at all. --- mk/bsd.pkg.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b67c6a83296..941c9aa1bb5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1491 2004/08/17 17:48:11 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1492 2004/08/24 00:27:13 tv Exp $ # # This file is in the public domain. # @@ -419,14 +419,6 @@ _DUMP_LIBTOOL_LA_FILES?=${TRUE} BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext .endif -.if defined(RECOMMENDED) -. if !empty(IGNORE_RECOMMENDED:M[nN][oO]) -DEPENDS+= ${RECOMMENDED} -. else -BUILD_DEFS+= IGNORE_RECOMMENDED -. endif -.endif - EXTRACT_COOKIE= ${WRKDIR}/.extract_done BUILDLINK_COOKIE= ${WRKDIR}/.buildlink_done CONFIGURE_COOKIE= ${WRKDIR}/.configure_done @@ -1231,6 +1223,14 @@ NO_BUILDLINK= # defined . endif .endif +.if defined(RECOMMENDED) +. if !empty(IGNORE_RECOMMENDED:M[nN][oO]) +DEPENDS+= ${RECOMMENDED} +. else +BUILD_DEFS+= IGNORE_RECOMMENDED +. endif +.endif + .if defined(USE_DIRS) && !empty(USE_DIRS) && \ ${PKG_INSTALLATION_TYPE} == "overwrite" . include "../../mk/dirs.mk" -- cgit v1.2.3