diff options
| author | bapt <bapt@FreeBSD.org> | 2013-06-07 16:06:17 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-06-07 16:06:17 +0800 |
| commit | c60ece873246c38eb7a50f32f0fd35997808d097 (patch) | |
| tree | b061ecc4d58ddf4303c6b44ce13d75a2f7c01167 /Mk | |
| parent | 85c1a8979bac36d029bbdc25dd065e2fcacb2fa9 (diff) | |
| download | freebsd-ports-gnome-c60ece873246c38eb7a50f32f0fd35997808d097.tar.gz freebsd-ports-gnome-c60ece873246c38eb7a50f32f0fd35997808d097.tar.zst freebsd-ports-gnome-c60ece873246c38eb7a50f32f0fd35997808d097.zip | |
Do not automatically popup dialog in case only options from global options are defined
Requested by: many
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.options.mk | 7 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk index 693c8c7c9e10..dfe42536f913 100644 --- a/Mk/bsd.options.mk +++ b/Mk/bsd.options.mk @@ -54,6 +54,8 @@ OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options #ALL_OPTIONS= DOCS \ # NLS +GLOBAL_OPTIONS= DOCS NLS EXAMPLES IPV6 + # Set the default values for the global options, as defined by portmgr .if !defined(NOPORTDOCS) PORT_OPTIONS+= DOCS @@ -315,3 +317,8 @@ WITH_${opt}:= true .endfor .endif ### + +_OPTIONS_WITHOUT_GLOBALS:= ${COMPLETE_OPTIONS_LIST} +.for opt in ${GLOBAL_OPTIONS} +_OPTIONS_WITHOUT_GLOBALS:= ${_OPTIONS_WITHOUT_GLOBALS:N${opt}} +.endfor diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index ef71cda82610..0ef87d6fe6c9 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6180,7 +6180,7 @@ config-recursive: .if !target(config-conditional) config-conditional: pre-config -.if defined(COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG) +.if defined(COMPLETE_OPTIONS_LIST) && !empty(_OPTIONS_WITHOUT_GLOBALS) && !defined(NO_DIALOG) . if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O} @cd ${.CURDIR} && ${MAKE} do-config; . endif |