From 46ee703fbf12763b613cab460cf04458bf530349 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 5 Aug 2004 02:10:20 +0000
Subject: Move addition of PKG_OPTIONS to BUILD_DEFS below the definition of
 the build-defs-message target so that PKG_OPTIONS doesn't show up as a
 settable variable in the displayed message.

---
 mk/bsd.options.mk | 7 +------
 mk/bsd.pkg.mk     | 9 ++++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index 6a0a7ea33ef..2763ad8284a 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.options.mk,v 1.3 2004/08/04 23:25:14 jlam Exp $
+# $NetBSD: bsd.options.mk,v 1.4 2004/08/05 02:10:20 jlam Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
@@ -158,11 +158,6 @@ PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported build option."
 .  endif
 .endfor
 
-# Store the result in the +BUILD_INFO file so we can query for the build
-# options using "pkg_info -Q PKG_OPTIONS <pkg>".
-#
-BUILD_DEFS+=		PKG_OPTIONS
-
 .PHONY: pre-install-depends supported-options-message
 pre-install-depends: supported-options-message
 .if !defined(PKG_SUPPORTED_OPTIONS)
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3f0d02c7c06..2d1452d9b22 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1486 2004/08/04 23:29:50 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1487 2004/08/05 02:10:20 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -89,6 +89,13 @@ ${_var_}+=	${${_var_}.*}
 .  endif
 .endfor
 
+# Store the result in the +BUILD_INFO file so we can query for the build
+# options using "pkg_info -Q PKG_OPTIONS <pkg>".
+#
+.if defined(PKG_SUPPORTED_OPTIONS) && defined(PKG_OPTIONS)
+BUILD_DEFS+=            PKG_OPTIONS
+.endif
+
 ##### Build crypto packages by default.
 MKCRYPTO?=		yes
 
-- 
cgit v1.2.3