Date: Wed, 1 Mar 2017 04:35:22 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> 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 Message-ID: <201703010435.v214ZMG2022970@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703010435.v214ZMG2022970>