From owner-svn-src-head@FreeBSD.ORG  Tue Mar 26 20:11:10 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 762ED693;
 Tue, 26 Mar 2013 20:11:10 +0000 (UTC)
 (envelope-from emaste@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 68004B5B;
 Tue, 26 Mar 2013 20:11:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2QKBAt4094761;
 Tue, 26 Mar 2013 20:11:10 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2QKBAjm094760;
 Tue, 26 Mar 2013 20:11:10 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201303262011.r2QKBAjm094760@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 26 Mar 2013 20:11:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r248751 - 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
 <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, 26 Mar 2013 20:11:10 -0000

Author: emaste
Date: Tue Mar 26 20:11:09 2013
New Revision: 248751
URL: http://svnweb.freebsd.org/changeset/base/248751

Log:
  Unconditionally include ${SRCCONF} if overridden
  
  This avoids silently failing to include ${SRCCONF} specified by a make(1)
  invocation.

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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Tue Mar 26 20:04:45 2013	(r248750)
+++ head/share/mk/bsd.own.mk	Tue Mar 26 20:11:09 2013	(r248751)
@@ -117,7 +117,7 @@ __<bsd.own.mk>__:
 
 .if !defined(_WITHOUT_SRCCONF)
 SRCCONF?=	/etc/src.conf
-.if exists(${SRCCONF})
+.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf"
 .include "${SRCCONF}"
 .endif
 .endif