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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
