[pkgsrc/trunk]: pkgsrc/mk make sure some variables are initialized before usi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/db896403a2d6
branches:  trunk
changeset: 485310:db896403a2d6
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Dec 05 22:38:06 2004 +0000

description:
make sure some variables are initialized before using them.

diffstat:

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

diffs (26 lines):

diff -r 924ad4138324 -r db896403a2d6 mk/bsd.options.mk
--- a/mk/bsd.options.mk Sun Dec 05 21:53:51 2004 +0000
+++ b/mk/bsd.options.mk Sun Dec 05 22:38:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.12 2004/12/05 09:20:48 grant Exp $
+# $NetBSD: bsd.options.mk,v 1.13 2004/12/05 22:38:06 grant 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)
+.if !defined(_PKG_OPTIONS_AVAILABLE) && defined(PKG_SUPPORTED_OPTIONS)
 _PKG_OPTIONS_AVAILABLE!=       ${ECHO} ${PKG_SUPPORTED_OPTIONS} | ${XARGS} -n 1 | ${SORT}
 .endif
-.if !defined(_PKG_OPTIONS_DEFAULT)
+.if !defined(_PKG_OPTIONS_DEFAULT) && defined(PKG_DEFAULT_OPTIONS)
 _PKG_OPTIONS_DEFAULT!=         ${ECHO} ${PKG_DEFAULT_OPTIONS} | ${XARGS} -n 1 | ${SORT}
 .endif
-.if !defined(_PKG_OPTIONS_ENABLED)
+.if !defined(_PKG_OPTIONS_ENABLED) && defined(PKG_OPTIONS)
 _PKG_OPTIONS_ENABLED!=         ${ECHO} ${PKG_OPTIONS} | ${XARGS} -n 1 | ${SORT}
 .endif