diff options
| author | schmonz <schmonz@pkgsrc.org> | 2004-12-05 23:23:50 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2004-12-05 23:23:50 +0000 |
| commit | c0b159de2ec9f6d45b220d6f8aece092aa5b4c31 (patch) | |
| tree | c9bc29bfab1c2e597469d1933e4d488045de1e05 /mk/bsd.options.mk | |
| parent | c07577e75dbb18347a830e49e59333907957dc3c (diff) | |
| download | pkgsrc-c0b159de2ec9f6d45b220d6f8aece092aa5b4c31.tar.gz | |
In the show-options target, ensure that PKG_OPTIONS and friends
are non-empty before shelling out to xargs. Silences spurious output
from "pkg_chk -i" and probably others.
Diffstat (limited to 'mk/bsd.options.mk')
| -rw-r--r-- | mk/bsd.options.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 5748fbfd964..481657dfbe9 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.13 2004/12/05 22:38:06 grant Exp $ +# $NetBSD: bsd.options.mk,v 1.14 2004/12/05 23:23:50 schmonz Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -176,13 +176,13 @@ _PKG_OPTIONS_WORDWRAP_FILTER= \ END { if (length(line) > 0) print " "line } \ ' -.if !defined(_PKG_OPTIONS_AVAILABLE) && defined(PKG_SUPPORTED_OPTIONS) +.if !defined(_PKG_OPTIONS_AVAILABLE) && defined(PKG_SUPPORTED_OPTIONS) && !empty(PKG_SUPPORTED_OPTIONS) _PKG_OPTIONS_AVAILABLE!= ${ECHO} ${PKG_SUPPORTED_OPTIONS} | ${XARGS} -n 1 | ${SORT} .endif -.if !defined(_PKG_OPTIONS_DEFAULT) && defined(PKG_DEFAULT_OPTIONS) +.if !defined(_PKG_OPTIONS_DEFAULT) && defined(PKG_DEFAULT_OPTIONS) && !empty(PKG_DEFAULT_OPTIONS) _PKG_OPTIONS_DEFAULT!= ${ECHO} ${PKG_DEFAULT_OPTIONS} | ${XARGS} -n 1 | ${SORT} .endif -.if !defined(_PKG_OPTIONS_ENABLED) && defined(PKG_OPTIONS) +.if !defined(_PKG_OPTIONS_ENABLED) && defined(PKG_OPTIONS) && !empty(PKG_OPTIONS) _PKG_OPTIONS_ENABLED!= ${ECHO} ${PKG_OPTIONS} | ${XARGS} -n 1 | ${SORT} .endif |