From owner-svn-src-head@FreeBSD.ORG  Thu Apr 24 02:02:52 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0FD8F901;
 Thu, 24 Apr 2014 02:02:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB4E314AC;
 Thu, 24 Apr 2014 02:02:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3O22pQZ064299;
 Thu, 24 Apr 2014 02:02:51 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3O22pkw064298;
 Thu, 24 Apr 2014 02:02:51 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201404240202.s3O22pkw064298@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 24 Apr 2014 02:02:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264862 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 02:02:52 -0000

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