From owner-svn-src-head@FreeBSD.ORG Wed Apr 3 16:20:22 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id BF54CBD5; Wed, 3 Apr 2013 16:20:22 +0000 (UTC) (envelope-from sjg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B2229E01; Wed, 3 Apr 2013 16:20:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r33GKMZL091083; Wed, 3 Apr 2013 16:20:22 GMT (envelope-from sjg@svn.freebsd.org) Received: (from sjg@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r33GKMBt091082; Wed, 3 Apr 2013 16:20:22 GMT (envelope-from sjg@svn.freebsd.org) Message-Id: <201304031620.r33GKMBt091082@svn.freebsd.org> From: "Simon J. Gerraty" Date: Wed, 3 Apr 2013 16:20:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r249057 - 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.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 16:20:22 -0000 Author: sjg Date: Wed Apr 3 16:20:21 2013 New Revision: 249057 URL: http://svnweb.freebsd.org/changeset/base/249057 Log: Tell bmake to use the FreeBSD preferred makefile preference list. PR: 177593 Reviewed by: obrien Modified: head/share/mk/sys.mk Modified: head/share/mk/sys.mk ============================================================================== --- head/share/mk/sys.mk Wed Apr 3 16:02:01 2013 (r249056) +++ head/share/mk/sys.mk Wed Apr 3 16:20:21 2013 (r249057) @@ -333,6 +333,9 @@ OBJFORMAT?= elf # Tell bmake to expand -V VAR by default .MAKE.EXPAND_VARIABLES= yes +# Tell bmake the makefile preference +.MAKE.MAKEFILE_PREFERENCE?= BSDmakefile makefile Makefile + .if !defined(.PARSEDIR) # We are not bmake, which is more aggressive about searching .PATH # It is sometime necessary to curb its enthusiasm with .NOPATH