Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Mar 2013 20:11:10 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r248751 - head/share/mk
Message-ID:  <201303262011.r2QKBAjm094760@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303262011.r2QKBAjm094760>