[pkgsrc/trunk]: pkgsrc/mk In the show-options target, ensure that PKG_OPTIONS...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc848c98e300
branches:  trunk
changeset: 485315:dc848c98e300
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Dec 05 23:23:50 2004 +0000

description:
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:

 mk/bsd.options.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r 03cd24bb09f9 -r dc848c98e300 mk/bsd.options.mk
--- a/mk/bsd.options.mk Sun Dec 05 23:19:08 2004 +0000
+++ b/mk/bsd.options.mk Sun Dec 05 23:23:50 2004 +0000
@@ -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 @@
                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