svn commit: r264862 - head/share/mk

[Warner Losh]

Author: imp
Date: Thu Apr 24 02:02:51 2014
New Revision: 264862
URL: http://svnweb.freebsd.org/changeset/base/264862

Log:
  Include bsd.opts.mk before Makefile.inc so Makefile.inc can do things
  based on MK_xxx symbols. Continue to include bsd.own.mk after
  Makefile.inc to preserve current behavior.

Modified:
  head/share/mk/bsd.init.mk

Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk	Thu Apr 24 02:02:46 2014	(r264861)
+++ head/share/mk/bsd.init.mk	Thu Apr 24 02:02:51 2014	(r264862)
@@ -1,11 +1,14 @@
 # $FreeBSD$
 
-# The include file <bsd.init.mk> includes ../Makefile.inc and
-# <bsd.own.mk>; this is used at the top of all <bsd.*.mk> files
-# that actually "build something".
+# The include file <bsd.init.mk> includes <bsd.opts.mk>,
+# ../Makefile.inc and <bsd.own.mk>; this is used at the
+# top of all <bsd.*.mk> files that actually "build something".
+# bsd.opts.mk is included early so Makefile.inc can use the
+# MK_FOO variables.
 
 .if !target(__<bsd.init.mk>__)
 __<bsd.init.mk>__:
+.include <bsd.opts.mk>
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
 .endif