From owner-svn-src-head@freebsd.org  Mon Aug 29 22:47:55 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 1C7F3B79AA8;
 Mon, 29 Aug 2016 22:47:55 +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 E0DF7C9;
 Mon, 29 Aug 2016 22:47:54 +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 u7TMlsVI050552;
 Mon, 29 Aug 2016 22:47:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7TMlsXI050549;
 Mon, 29 Aug 2016 22:47:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201608292247.u7TMlsXI050549@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: Mon, 29 Aug 2016 22:47:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r305033 - in head/lib/atf: libatf-c libatf-c++
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.22
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, 29 Aug 2016 22:47:55 -0000

Author: ngie
Date: Mon Aug 29 22:47:53 2016
New Revision: 305033
URL: https://svnweb.freebsd.org/changeset/base/305033

Log:
  Minor Makefile simplifications for lib/atf/...
  
  - Replace uses of `${.CURDIR:H:H:H}` with ${SRCTOP}
  - Use built-in :H operator instead of ".." when enumerating paths.
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/atf/libatf-c++/Makefile
  head/lib/atf/libatf-c/Makefile

Modified: head/lib/atf/libatf-c++/Makefile
==============================================================================
--- head/lib/atf/libatf-c++/Makefile	Mon Aug 29 22:47:14 2016	(r305032)
+++ head/lib/atf/libatf-c++/Makefile	Mon Aug 29 22:47:53 2016	(r305033)
@@ -35,15 +35,15 @@ SHLIB_MAJOR=	2
 # libatf-c++ depends on the C version of the ATF library to build.
 LIBADD+=	atf_c
 
-LDFLAGS+=	-L${.OBJDIR}/../libatf-c
+LDFLAGS+=	-L${.OBJDIR:H}/libatf-c
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
 
 CFLAGS+=	-I${ATF}
-CFLAGS+=	-I${.CURDIR}/../libatf-c
+CFLAGS+=	-I${.CURDIR:H}/libatf-c
 CFLAGS+=	-I.
 
 CFLAGS+=	-DHAVE_CONFIG_H

Modified: head/lib/atf/libatf-c/Makefile
==============================================================================
--- head/lib/atf/libatf-c/Makefile	Mon Aug 29 22:47:14 2016	(r305032)
+++ head/lib/atf/libatf-c/Makefile	Mon Aug 29 22:47:53 2016	(r305033)
@@ -36,7 +36,7 @@ LIB=		atf-c
 PRIVATELIB=	true
 SHLIB_MAJOR=	1
 
-ATF=		${.CURDIR:H:H:H}/contrib/atf
+ATF=		${SRCTOP}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail