From 1bbd68d2923d31879bd5951d9a763675b9af8a0b Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 8 Jun 2012 18:44:17 +0000
Subject: Fix make config-conditional with optionsng

Reported by:	ru@
---
 Mk/bsd.port.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index a535cb5da4a2..88f3e83c721c 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3270,7 +3270,8 @@ DEPENDS_ARGS+=	NOCLEANDEPENDS=yes
 # target or not.
 #
 ################################################################
-.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
+.if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
+	|| defined(CONFIG_DONE_${UNIQUENAME:U}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
 .endif
@@ -6093,7 +6094,7 @@ config-recursive:
 .if !target(config-conditional)
 config-conditional: pre-config
 .if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
-.  if ${_COMPLETE_OPTIONS_LIST} != "${_FILE_COMPLETE_OPTIONS_LIST}"
+.  if ${_COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O}
 	@cd ${.CURDIR} && ${MAKE} config;
 .  endif
 .endif
-- 
cgit v1.2.3