[pkgsrc/trunk]: pkgsrc/mk Move addition of PKG_OPTIONS to BUILD_DEFS below th...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40b35be61c6d
branches:  trunk
changeset: 479099:40b35be61c6d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 05 02:10:20 2004 +0000

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

diffstat:

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

diffs (44 lines):

diff -r b6a5142241ad -r 40b35be61c6d mk/bsd.options.mk
--- a/mk/bsd.options.mk Thu Aug 05 00:23:32 2004 +0000
+++ b/mk/bsd.options.mk Thu Aug 05 02:10:20 2004 +0000
@@ -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 @@
 .  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 -r b6a5142241ad -r 40b35be61c6d mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Aug 05 00:23:32 2004 +0000
+++ b/mk/bsd.pkg.mk     Thu Aug 05 02:10:20 2004 +0000
@@ -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 @@
 .  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