From owner-svn-src-all@freebsd.org Wed Mar 1 04:35:23 2017 Return-Path: Delivered-To: svn-src-all@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 A129DCF226C; Wed, 1 Mar 2017 04:35:23 +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 4BD2F843; Wed, 1 Mar 2017 04:35:23 +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 v214ZMD5022973; Wed, 1 Mar 2017 04:35:22 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v214ZMG2022970; Wed, 1 Mar 2017 04:35:22 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201703010435.v214ZMG2022970@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Wed, 1 Mar 2017 04:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314468 - in head/usr.sbin/zic: . zdump zic X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2017 04:35:23 -0000 Author: ngie Date: Wed Mar 1 04:35:21 2017 New Revision: 314468 URL: https://svnweb.freebsd.org/changeset/base/314468 Log: Use SRCTOP-relative paths to other directories instead of .CURDIR-relative ones Also, use :H where possible/sensical to manipulate .CURDIR-relative paths This simplifies pathing in make/displayed output. MFC after: 1 week Sponsored by: Dell EMC Isilon Modified: head/usr.sbin/zic/Makefile.inc head/usr.sbin/zic/zdump/Makefile head/usr.sbin/zic/zic/Makefile Modified: head/usr.sbin/zic/Makefile.inc ============================================================================== --- head/usr.sbin/zic/Makefile.inc Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/Makefile.inc Wed Mar 1 04:35:21 2017 (r314468) @@ -1,3 +1,3 @@ # $FreeBSD$ -.include "${.CURDIR}/../../Makefile.inc" +.include "${SRCTOP}/usr.sbin/Makefile.inc" Modified: head/usr.sbin/zic/zdump/Makefile ============================================================================== --- head/usr.sbin/zic/zdump/Makefile Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/zdump/Makefile Wed Mar 1 04:35:21 2017 (r314468) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zdump MAN= zdump.8 @@ -8,7 +8,7 @@ SRCS= zdump.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2 Modified: head/usr.sbin/zic/zic/Makefile ============================================================================== --- head/usr.sbin/zic/zic/Makefile Wed Mar 1 04:27:58 2017 (r314467) +++ head/usr.sbin/zic/zic/Makefile Wed Mar 1 04:35:21 2017 (r314468) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/tzcode/zic +.PATH: ${SRCTOP}/contrib/tzcode/zic PROG= zic MAN= zic.8 @@ -9,7 +9,7 @@ SRCS= zic.c ialloc.c scheck.c CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime +CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime WARNS?= 2