Date: Mon, 1 Apr 2013 12:17:41 -0400 From: John Baldwin <jhb@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r248751 - head/share/mk Message-ID: <201304011217.41274.jhb@freebsd.org> In-Reply-To: <201303262011.r2QKBAjm094760@svn.freebsd.org> References: <201303262011.r2QKBAjm094760@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 @@ __<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 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304011217.41274.jhb>