diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-17 16:20:06 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-17 16:20:06 +0000 |
| commit | 9bc22bc847d53f0b9d6130d607c2d62a4431a04d (patch) | |
| tree | 6f19c7ba0fe38e33438ace1f6ed71f20d3314fc5 /Mk | |
| parent | - Apply a patch (files/patch-sonata.py) to solve the conflict (diff) | |
Fix config-conditional
PR: Gareth Hopkins <gabbawp@gmail.com> (via ports@)
Tested by: jgh
Notes
Notes:
svn path=/head/; revision=301014
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index e0e8c69bc100..c065cf2608b7 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6098,8 +6098,8 @@ config-recursive: .if !target(config-conditional) config-conditional: pre-config -.if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG) -. if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${_COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O} +.if defined(COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG) +. if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O} @cd ${.CURDIR} && ${MAKE} config; . endif .endif |