OPTIONS handling doesn't seem to work fully in dependencies anymore

[Alex Dupre]

John Baldwin ha scritto:
> It used to work.

I was thinking the same thing, but actually it never worked in that way.

> I was just guessing about how it might not be working now 
> based on reading the existing logic.  I have not delved into the history to 
> see what has changed.

The attached patch should solve this erratic behavior.

-- 
Alex Dupre
-------------- next part --------------
--- bsd.port.mk.orig	2008-09-18 10:31:14.000000000 +0200
+++ bsd.port.mk	2008-09-18 10:46:02.000000000 +0200
@@ -3234,7 +3234,7 @@
 # target or not.
 #
 ################################################################
-.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
+.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
 .endif
@@ -4169,7 +4169,7 @@
 ${target}: ${${target:U}_COOKIE}
 .elif !target(${target})
 ${target}: config-conditional
-	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
+	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
 .elif target(${target}) && defined(IGNORE)
 .endif