Rename describe-options to show-options, replacing the old show-options

target.
This commit is contained in:
dillo 2005-05-31 12:10:07 +00:00
parent 02adf507ac
commit 8cda012601
2 changed files with 7 additions and 13 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.options.mk,v 1.26 2005/05/31 11:05:31 dillo Exp $
# $NetBSD: bsd.options.mk,v 1.27 2005/05/31 12:10:07 dillo Exp $
#
# This Makefile fragment provides boilerplate code for standard naming
# conventions for handling per-package build options.
@ -198,8 +198,8 @@ _PKG_OPTIONS_WORDWRAP_FILTER= \
END { if (length(line) > 0) print " "line } \
'
.PHONY: describe-options
describe-options:
.PHONY: show-options
show-options:
@${ECHO} The following options are supported by this package:
.for _opt_ in ${PKG_SUPPORTED_OPTIONS:O}
@${ECHO} " "${_opt_:Q}" "`${SED} -n "s/^"${_opt_:Q}" //p" ../../mk/defaults/options.description`
@ -208,12 +208,6 @@ describe-options:
@${ECHO} "These options are enabled by default: "${PKG_SUGGESTED_OPTIONS:O:Q}
@${ECHO} "These options are currently enabled: "${PKG_OPTIONS:O:Q}
.PHONY: show-options
show-options:
@${ECHO} "available: "${PKG_SUPPORTED_OPTIONS:O:Q}
@${ECHO} "default: "${PKG_SUGGESTED_OPTIONS:O:Q}
@${ECHO} "enabled: "${PKG_OPTIONS:O:Q}
.if defined(PKG_SUPPORTED_OPTIONS)
.PHONY: supported-options-message
pre-extract: supported-options-message

View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkg.mk,v 1.1679 2005/05/29 17:12:16 jmmv Exp $
# $NetBSD: bsd.pkg.mk,v 1.1680 2005/05/31 12:10:07 dillo Exp $
#
# This file is in the public domain.
#
@ -4083,9 +4083,9 @@ show-license show-licence:
# This target is defined in bsd.options.mk for packages that use
# the options framework.
.if !target(describe-options)
.PHONY: describe-options
describe-options:
.if !target(show-options)
.PHONY: show-options
show-options:
@${ECHO} This package does not use the options framework.
.endif