diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-08 18:44:17 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-06-08 18:44:17 +0000 |
| commit | 1bbd68d2923d31879bd5951d9a763675b9af8a0b (patch) | |
| tree | f5a40060b6f93cc82c6e9994575065a449f8890b /Mk | |
| parent | fd259a91fa99ad0f4b823a95446b8993a92d02ab (diff) | |
| download | ports-1bbd68d2923d31879bd5951d9a763675b9af8a0b.tar.gz ports-1bbd68d2923d31879bd5951d9a763675b9af8a0b.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |