From owner-svn-src-head@FreeBSD.ORG  Tue May  6 12:31:18 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 0EC84A0D;
 Tue,  6 May 2014 12:31:18 +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 F10DD3BB;
 Tue,  6 May 2014 12:31:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s46CVHit087259;
 Tue, 6 May 2014 12:31:17 GMT (envelope-from se@svn.freebsd.org)
Received: (from se@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s46CVH1j087258;
 Tue, 6 May 2014 12:31:17 GMT (envelope-from se@svn.freebsd.org)
Message-Id: <201405061231.s46CVH1j087258@svn.freebsd.org>
From: Stefan Esser <se@FreeBSD.org>
Date: Tue, 6 May 2014 12:31:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r265436 - head/usr.bin/bmake
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.18
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: Tue, 06 May 2014 12:31:18 -0000

Author: se
Date: Tue May  6 12:31:17 2014
New Revision: 265436
URL: http://svnweb.freebsd.org/changeset/base/265436

Log:
  Fix include statement to accept src.opts.mk from a source directory
  instead of from /usr/share/mk.
  
  I'm not sure that this will let buildworld complete on a system with
  no installed src.opts.mk (make buildworld is still running), but the
  tinderbox builds are all failing earlyon without this patch.

Modified:
  head/usr.bin/bmake/Makefile.inc

Modified: head/usr.bin/bmake/Makefile.inc
==============================================================================
--- head/usr.bin/bmake/Makefile.inc	Tue May  6 12:20:07 2014	(r265435)
+++ head/usr.bin/bmake/Makefile.inc	Tue May  6 12:31:17 2014	(r265436)
@@ -1,6 +1,6 @@
 # $FreeBSD$ 
 
-.include "src.opts.mk"
+.include <src.opts.mk>
 
 .if defined(.PARSEDIR)
 # make sure this is available to unit-tests/Makefile