From owner-svn-src-stable@freebsd.org  Fri Oct 21 08:36:32 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 0B55DC18E5A;
 Fri, 21 Oct 2016 08:36:32 +0000 (UTC)
 (envelope-from ngie@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 CD7E9E3F;
 Fri, 21 Oct 2016 08:36:31 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9L8aUox060824;
 Fri, 21 Oct 2016 08:36:30 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9L8aUC6060823;
 Fri, 21 Oct 2016 08:36:30 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201610210836.u9L8aUC6060823@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Fri, 21 Oct 2016 08:36:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r307722 - in stable/10/libexec/atf: atf-check atf-sh
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2016 08:36:32 -0000

Author: ngie
Date: Fri Oct 21 08:36:30 2016
New Revision: 307722
URL: https://svnweb.freebsd.org/changeset/base/307722

Log:
  MFstable/11 r307721:
  
  MFC r306029:
  
  Use SRCTOP instead of the longhand version for defining the path to contrib/atf

Modified:
  stable/10/libexec/atf/atf-check/Makefile
  stable/10/libexec/atf/atf-sh/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/libexec/atf/atf-check/Makefile
==============================================================================
--- stable/10/libexec/atf/atf-check/Makefile	Fri Oct 21 08:35:20 2016	(r307721)
+++ stable/10/libexec/atf/atf-check/Makefile	Fri Oct 21 08:36:30 2016	(r307722)
@@ -27,7 +27,7 @@
 
 .include <bsd.init.mk>
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 PROG_CXX=	atf-check

Modified: stable/10/libexec/atf/atf-sh/Makefile
==============================================================================
--- stable/10/libexec/atf/atf-sh/Makefile	Fri Oct 21 08:35:20 2016	(r307721)
+++ stable/10/libexec/atf/atf-sh/Makefile	Fri Oct 21 08:36:30 2016	(r307722)
@@ -27,7 +27,7 @@
 
 .include <bsd.init.mk>
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 PROG_CXX=	atf-sh