From owner-svn-src-all@FreeBSD.ORG Mon Apr 1 16:30:20 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1391441C; Mon, 1 Apr 2013 16:30:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 92A78164; Mon, 1 Apr 2013 16:30:19 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 79EF5B964; Mon, 1 Apr 2013 12:30:18 -0400 (EDT) From: John Baldwin To: Ed Maste Subject: Re: svn commit: r248751 - head/share/mk Date: Mon, 1 Apr 2013 12:17:41 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201303262011.r2QKBAjm094760@svn.freebsd.org> In-Reply-To: <201303262011.r2QKBAjm094760@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201304011217.41274.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Mon, 01 Apr 2013 12:30:18 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 16:30:20 -0000 On Tuesday, March 26, 2013 4:11:10 pm Ed Maste wrote: > 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 @@ ____: > > .if !defined(_WITHOUT_SRCCONF) > SRCCONF?= /etc/src.conf > -.if exists(${SRCCONF}) > +.if exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf" > .include "${SRCCONF}" > .endif > .endif Hmm, I'm confused why this matters? Was exists() failing for a file that did exist? Can you give a more specific use case? -- John Baldwin