From owner-svn-src-stable@freebsd.org  Sun Mar  4 23:34:05 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 73665F3E8DE;
 Sun,  4 Mar 2018 23:34:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 264267673C;
 Sun,  4 Mar 2018 23:34:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1EF9A1C186;
 Sun,  4 Mar 2018 23:34:05 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w24NY5E8050195;
 Sun, 4 Mar 2018 23:34:05 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w24NY4YH050194;
 Sun, 4 Mar 2018 23:34:04 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201803042334.w24NY4YH050194@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 4 Mar 2018 23:34:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r330425 - stable/10/share/mk
X-SVN-Group: stable-10
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: stable/10/share/mk
X-SVN-Commit-Revision: 330425
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Mar 2018 23:34:05 -0000

Author: bdrewery
Date: Sun Mar  4 23:34:04 2018
New Revision: 330425
URL: https://svnweb.freebsd.org/changeset/base/330425

Log:
  MFC r330127:
  
    Allow overriding .MAKE.MAKEFILE_PREFERENCE.

Modified:
  stable/10/share/mk/sys.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/sys.mk
==============================================================================
--- stable/10/share/mk/sys.mk	Sun Mar  4 23:34:02 2018	(r330424)
+++ stable/10/share/mk/sys.mk	Sun Mar  4 23:34:04 2018	(r330425)
@@ -356,7 +356,8 @@ SHELL=	${__MAKE_SHELL}
 .MAKE.EXPAND_VARIABLES= yes
 
 # Tell bmake the makefile preference
-.MAKE.MAKEFILE_PREFERENCE= BSDmakefile makefile Makefile
+MAKEFILE_PREFERENCE?= BSDmakefile makefile Makefile
+.MAKE.MAKEFILE_PREFERENCE= ${MAKEFILE_PREFERENCE}
 
 # By default bmake does *not* use set -e
 # when running target scripts, this is a problem for many makefiles here.