diff options
| author | jlam <jlam> | 2005-04-28 21:48:14 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-04-28 21:48:14 +0000 |
| commit | e0d797fabea998b20c25fbb28f54543b31641c27 (patch) | |
| tree | 3f0a30e50ef1731a259ae97b5537b8da50310d3f | |
| parent | 2418a31c7a4fad3ceec8b9dc65ca58caef209a5f (diff) | |
| download | pkgsrc-e0d797fabea998b20c25fbb28f54543b31641c27.tar.gz | |
We don't need to use ${SORT} to sort the options list. VAR:O will do
nicely.
| -rw-r--r-- | mk/bsd.options.mk | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 46dd6889f17..9a019297936 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.17 2005/04/28 18:40:35 jlam Exp $ +# $NetBSD: bsd.options.mk,v 1.18 2005/04/28 21:48:14 jlam Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -176,18 +176,11 @@ _PKG_OPTIONS_WORDWRAP_FILTER= \ END { if (length(line) > 0) print " "line } \ ' -_PKG_OPTIONS_AVAILABLE_CMD= \ - ${ECHO} ${PKG_SUPPORTED_OPTIONS:Q} | ${XARGS} -n 1 | ${SORT} -_PKG_OPTIONS_DEFAULT_CMD= \ - ${ECHO} ${PKG_DEFAULT_OPTIONS:Q} | ${XARGS} -n 1 | ${SORT} -_PKG_OPTIONS_ENABLED_CMD= \ - ${ECHO} ${PKG_OPTIONS:Q} | ${XARGS} -n 1 | ${SORT} - .PHONY: show-options show-options: - @${ECHO} "available: "${_PKG_OPTIONS_AVAILABLE_CMD:sh:Q} - @${ECHO} "default: "${_PKG_OPTIONS_DEFAULT_CMD:sh:Q} - @${ECHO} "enabled: "${_PKG_OPTIONS_ENABLED_CMD:sh:Q} + @${ECHO} "available: "${PKG_SUPPORTED_OPTIONS:O:Q} + @${ECHO} "default: "${PKG_DEFAULT_OPTIONS:O:Q} + @${ECHO} "enabled: "${PKG_OPTIONS:O:Q} .if defined(PKG_SUPPORTED_OPTIONS) .PHONY: supported-options-message @@ -197,12 +190,12 @@ supported-options-message: @${ECHO} "==========================================================================" @${ECHO} "The supported build options for this package are:" @${ECHO} "" - @${ECHO} ${_PKG_OPTIONS_AVAILABLE_CMD:sh:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER} + @${ECHO} ${PKG_SUPPORTED_OPTIONS:O:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER} . if !empty(PKG_OPTIONS) @${ECHO} "" @${ECHO} "The currently selected options are:" @${ECHO} "" - @${ECHO} ${_PKG_OPTIONS_ENABLED_CMD:sh:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER} + @${ECHO} ${PKG_OPTIONS:O:Q} | ${_PKG_OPTIONS_WORDWRAP_FILTER} . endif @${ECHO} "" @${ECHO} "You can select which build options to use by setting the following" |