From owner-svn-src-head@freebsd.org  Mon Jan 25 22:29:45 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB549A465B2;
 Mon, 25 Jan 2016 22:29:45 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 BDB2ADA2;
 Mon, 25 Jan 2016 22:29:45 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0PMTiDS062178;
 Mon, 25 Jan 2016 22:29:44 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0PMTiJU062177;
 Mon, 25 Jan 2016 22:29:44 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201601252229.u0PMTiJU062177@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 25 Jan 2016 22:29:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r294752 - 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.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jan 2016 22:29:46 -0000

Author: bdrewery
Date: Mon Jan 25 22:29:44 2016
New Revision: 294752
URL: https://svnweb.freebsd.org/changeset/base/294752

Log:
  Fix PROGS not reading .depend files after r284288 by making DEPENDFILE work.
  
  We have had this user-modifable DEPENDFILE variable forever that does nothing
  relevant for the user since fmake always used '.depend'.  Bmake
  introduced the .MAKE.DEPENDFILE variable that can be modified to change
  the name of '.depend'.
  
  Prior to r284288, bsd.progs.mk was setting .MAKE.DEPENDFILE to allow
  working incremental builds.  This was modified most likely to not
  conflict with the META MODE handling of .MAKE.DEPENDFILE as it has a lot
  more special logic for that variable.
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

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

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Mon Jan 25 22:29:41 2016	(r294751)
+++ head/share/mk/bsd.dep.mk	Mon Jan 25 22:29:44 2016	(r294752)
@@ -56,6 +56,7 @@ _MKDEPCC+=	${DEPFLAGS}
 .endif
 MKDEPCMD?=	CC='${_MKDEPCC}' mkdep
 DEPENDFILE?=	.depend
+.MAKE.DEPENDFILE= ${DEPENDFILE}
 DEPENDFILES=	${DEPENDFILE}
 
 # Keep `tags' here, before SRCS are mangled below for `depend'.