From owner-svn-src-all@FreeBSD.ORG  Sat Jan 22 23:16:44 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA14D106566B;
	Sat, 22 Jan 2011 23:16:44 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D93718FC08;
	Sat, 22 Jan 2011 23:16:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0MNGivm007803;
	Sat, 22 Jan 2011 23:16:44 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0MNGi91007801;
	Sat, 22 Jan 2011 23:16:44 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201101222316.p0MNGi91007801@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 22 Jan 2011 23:16:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217735 - head
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jan 2011 23:16:45 -0000

Author: bz
Date: Sat Jan 22 23:16:44 2011
New Revision: 217735
URL: http://svn.freebsd.org/changeset/base/217735

Log:
  Make `make tinderbox` work with MAKEOBJDIRPREFIX set (or in possibly other
  combinations) by forcing FAILFILE into .CURDIR as we do for all other
  universe output files. [1]  Similarly make FAILFILE start with "_." as well.
  
  Reviewed by:	silence-on-src [1]
  MFC after:	6 days

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sat Jan 22 23:10:58 2011	(r217734)
+++ head/Makefile	Sat Jan 22 23:16:44 2011	(r217735)
@@ -305,7 +305,7 @@ targets:
 .endfor
 
 .if defined(DOING_TINDERBOX)
-FAILFILE=tinderbox.failed
+FAILFILE=${.CURDIR}/_.tinderbox.failed
 MAKEFAIL=tee -a ${FAILFILE}
 .else
 MAKEFAIL=cat