svn commit: r314659 - in head/usr.sbin: acpi amd amd/amd amd/libamu ancontrol audit auditd auditdistd auditreduce authpf autofs bhyvectl bhyveload bluetooth bluetooth/bthidcontrol bluetooth/rfcomm_...
Ngie Cooper
ngie at FreeBSD.org
Sat Mar 4 11:38:11 UTC 2017
Author: ngie
Date: Sat Mar 4 11:38:03 2017
New Revision: 314659
URL: https://svnweb.freebsd.org/changeset/base/314659
Log:
usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible
This simplifies make logic/output
MFC after: 1 month
Sponsored by: Dell EMC Isilon
Modified:
head/usr.sbin/acpi/Makefile.inc
head/usr.sbin/amd/Makefile.inc
head/usr.sbin/amd/amd/Makefile
head/usr.sbin/amd/libamu/Makefile
head/usr.sbin/ancontrol/Makefile
head/usr.sbin/audit/Makefile
head/usr.sbin/auditd/Makefile
head/usr.sbin/auditdistd/Makefile
head/usr.sbin/auditreduce/Makefile
head/usr.sbin/authpf/Makefile
head/usr.sbin/autofs/Makefile
head/usr.sbin/bhyvectl/Makefile
head/usr.sbin/bhyveload/Makefile
head/usr.sbin/bluetooth/Makefile.inc
head/usr.sbin/bluetooth/bthidcontrol/Makefile
head/usr.sbin/bluetooth/rfcomm_pppd/Makefile
head/usr.sbin/bsnmpd/bsnmpd/Makefile
head/usr.sbin/bsnmpd/gensnmptree/Makefile
head/usr.sbin/bsnmpd/tools/Makefile.inc
head/usr.sbin/camdd/Makefile
head/usr.sbin/ckdist/Makefile
head/usr.sbin/cron/crontab/Makefile
head/usr.sbin/cron/lib/Makefile
head/usr.sbin/ctladm/Makefile
head/usr.sbin/ctld/Makefile
head/usr.sbin/ctm/Makefile.inc
head/usr.sbin/ctm/ctm/Makefile
head/usr.sbin/ctm/ctm_dequeue/Makefile
head/usr.sbin/ctm/ctm_smail/Makefile
head/usr.sbin/dconschat/Makefile
head/usr.sbin/editmap/Makefile
head/usr.sbin/eeprom/Makefile
head/usr.sbin/fdcontrol/Makefile
head/usr.sbin/fdformat/Makefile
head/usr.sbin/fmtree/Makefile
head/usr.sbin/fstyp/Makefile
head/usr.sbin/ftp-proxy/Makefile
head/usr.sbin/fwcontrol/Makefile
head/usr.sbin/gpioctl/Makefile
head/usr.sbin/gssd/Makefile
head/usr.sbin/hyperv/tools/kvp/Makefile
head/usr.sbin/hyperv/tools/vss/Makefile
head/usr.sbin/iovctl/Makefile
head/usr.sbin/ipfwpcap/Makefile
head/usr.sbin/iscsid/Makefile
head/usr.sbin/mailstats/Makefile
head/usr.sbin/mailwrapper/Makefile
head/usr.sbin/makemap/Makefile
head/usr.sbin/mlxcontrol/Makefile
head/usr.sbin/mount_smbfs/Makefile
head/usr.sbin/mountd/Makefile
head/usr.sbin/mpsutil/Makefile
head/usr.sbin/ndiscvt/Makefile
head/usr.sbin/ndp/Makefile
head/usr.sbin/nmtree/Makefile
head/usr.sbin/pkg/Makefile
head/usr.sbin/pnpinfo/Makefile
head/usr.sbin/praliases/Makefile
head/usr.sbin/praudit/Makefile
head/usr.sbin/pwd_mkdb/Makefile
head/usr.sbin/rip6query/Makefile
head/usr.sbin/rpcbind/tests/Makefile
head/usr.sbin/rtadvctl/Makefile
head/usr.sbin/sa/Makefile
head/usr.sbin/sendmail/Makefile
head/usr.sbin/tcpdump/tcpdump/Makefile
head/usr.sbin/timed/timedc/Makefile
Modified: head/usr.sbin/acpi/Makefile.inc
==============================================================================
--- head/usr.sbin/acpi/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/acpi/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,13 +1,13 @@
# $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
# $FreeBSD$
-ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica
-CFLAGS+= -I${.CURDIR}/../../../sys
+ACPICA_DIR= ${SRCTOP}/sys/contrib/dev/acpica
+CFLAGS+= -I${SRCTOP}/sys
PACKAGE= acpi
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.CURDIR:H:H}/Makefile.inc)
+.include "${.CURDIR:H:H}/Makefile.inc"
.endif
.PATH: ${ACPICA_DIR} \
Modified: head/usr.sbin/amd/Makefile.inc
==============================================================================
--- head/usr.sbin/amd/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/amd/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659)
@@ -13,13 +13,13 @@
PACKAGE= amd
-CFLAGS+= -I. -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../include
-.if exists(${.OBJDIR}/../include)
-CFLAGS+= -I${.OBJDIR}/../include
+CFLAGS+= -I. -I${.CURDIR}
+CFLAGS+= -I${.CURDIR:H}/include
+.if exists(${.OBJDIR:H}/include)
+CFLAGS+= -I${.OBJDIR:H}/include
.endif
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/amd
+CFLAGS+= -I${SRCTOP}/contrib/amd/include
+CFLAGS+= -I${SRCTOP}/contrib/amd
CFLAGS+= -DHAVE_CONFIG_H
.if ${MK_NIS} == "no"
CFLAGS+= -DHAVE_LOCALCONFIG_H
@@ -37,6 +37,6 @@ NFS_PROT_X= ${SRCTOP}/include/rpcsvc/nfs
WARNS?= 1
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.CURDIR:H:H}/Makefile.inc)
+.include "${.CURDIR:H:H}/Makefile.inc"
.endif
Modified: head/usr.sbin/amd/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/amd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/amd/amd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -28,7 +28,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c sun_m
CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
-I${SRCTOP}/contrib/amd/include \
- -I${.OBJDIR}/../../../include/rpcsvc
+ -I${OBJTOP}/include/rpcsvc
LIBADD= amu
@@ -62,7 +62,7 @@ SRCS+= mount_xdr.c
CLEANFILES+= mount_xdr.c
mount_xdr.c: ${MOUNT_X}
- ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET}
+ ${RPCCOM} -c -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET}
.if ${MK_HESIOD} != "no"
SRCS+= info_hesiod.c
Modified: head/usr.sbin/amd/libamu/Makefile
==============================================================================
--- head/usr.sbin/amd/libamu/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/amd/libamu/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -23,10 +23,10 @@ SRCS+= nfs_prot_x.c xdr_func_%undef.c
CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c
CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \
- -I${.OBJDIR}/../../../include/rpcsvc
+ -I${OBJTOP}/include/rpcsvc
nfs_prot_x.c: ${NFS_PROT_X}
- ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET}
+ ${RPCCOM} -c -C -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET}
XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}'
Modified: head/usr.sbin/ancontrol/Makefile
==============================================================================
--- head/usr.sbin/ancontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ancontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,7 +4,7 @@ PROG= ancontrol
MAN= ancontrol.8
WARNS?= 3
-CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys
+CFLAGS+= -DANCACHE -I${SRCTOP}/sys
LIBADD= md
Modified: head/usr.sbin/audit/Makefile
==============================================================================
--- head/usr.sbin/audit/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/audit/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/audit
CFLAGS+= -I${OPENBSMDIR}
Modified: head/usr.sbin/auditd/Makefile
==============================================================================
--- head/usr.sbin/auditd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/auditd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditd
CFLAGS+= -I${OPENBSMDIR}
Modified: head/usr.sbin/auditdistd/Makefile
==============================================================================
--- head/usr.sbin/auditdistd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/auditdistd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditdistd
# Addition of auditdistd because otherwise generated parse.c can't find
Modified: head/usr.sbin/auditreduce/Makefile
==============================================================================
--- head/usr.sbin/auditreduce/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/auditreduce/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditreduce
CFLAGS+= -I${OPENBSMDIR}
Modified: head/usr.sbin/authpf/Makefile
==============================================================================
--- head/usr.sbin/authpf/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/authpf/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/pf/authpf
+.PATH: ${SRCTOP}/contrib/pf/authpf
PROG= authpf
MAN= authpf.8
Modified: head/usr.sbin/autofs/Makefile
==============================================================================
--- head/usr.sbin/autofs/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/autofs/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -13,14 +13,14 @@ SRCS+= popen.c
SRCS+= token.l
CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs
+CFLAGS+=-I${SRCTOP}/sys/fs/autofs
MAN= automount.8 automountd.8 autounmountd.8 auto_master.5
LIBADD= util
# Needed for getmntopts.c
-MOUNT= ${.CURDIR}/../../sbin/mount
+MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+=-I${MOUNT}
WARNS= 6
Modified: head/usr.sbin/bhyvectl/Makefile
==============================================================================
--- head/usr.sbin/bhyvectl/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bhyvectl/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -12,6 +12,6 @@ LIBADD= vmmapi util
WARNS?= 3
-CFLAGS+= -I${.CURDIR}/../../sys/amd64/vmm
+CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
.include <bsd.prog.mk>
Modified: head/usr.sbin/bhyveload/Makefile
==============================================================================
--- head/usr.sbin/bhyveload/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bhyveload/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -9,6 +9,6 @@ LIBADD= vmmapi
WARNS?= 3
-CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot
+CFLAGS+=-I${SRCTOP}/sys/boot/userboot
.include <bsd.prog.mk>
Modified: head/usr.sbin/bluetooth/Makefile.inc
==============================================================================
--- head/usr.sbin/bluetooth/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bluetooth/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,4 +1,3 @@
# $FreeBSD$
-.include "${.CURDIR}/../../Makefile.inc"
-
+.include "${.CURDIR:H:H}/Makefile.inc"
Modified: head/usr.sbin/bluetooth/bthidcontrol/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/bthidcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bluetooth/bthidcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,13 +1,13 @@
# $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
# $FreeBSD$
-.PATH: ${.CURDIR}/../bthidd
+.PATH: ${.CURDIR:H}/bthidd
PROG= bthidcontrol
MAN= bthidcontrol.8
SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c
WARNS?= 1
-CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd
+CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR:H}/bthidd
LIBADD+= bluetooth sdp usbhid
Modified: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,7 +1,7 @@
# $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd
+.PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd
PROG= rfcomm_pppd
MAN= rfcomm_pppd.8
Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/bsnmpd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bsnmpd/bsnmpd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,7 +4,7 @@
.include <src.opts.mk>
-CONTRIB=${.CURDIR}/../../../contrib/bsnmp
+CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/snmpd
PROG= bsnmpd
Modified: head/usr.sbin/bsnmpd/gensnmptree/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/gensnmptree/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bsnmpd/gensnmptree/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
#
# Author: Harti Brandt <harti at freebsd.org>
-CONTRIB=${.CURDIR}/../../../contrib/bsnmp
+CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/gensnmptree
PROG= gensnmptree
Modified: head/usr.sbin/bsnmpd/tools/Makefile.inc
==============================================================================
--- head/usr.sbin/bsnmpd/tools/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/bsnmpd/tools/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659)
@@ -6,10 +6,10 @@ PACKAGE= bsnmp
CFLAGS+= -I. -I${.CURDIR}
-.if exists(${.OBJDIR}/../libbsnmptools)
-LIBBSNMPTOOLSDIR= ${.OBJDIR}/../libbsnmptools
+.if exists(${.OBJDIR:H}/libbsnmptools)
+LIBBSNMPTOOLSDIR= ${.OBJDIR:H}/libbsnmptools
.else
-LIBBSNMPTOOLSDIR= ${.CURDIR}/../libbsnmptools
+LIBBSNMPTOOLSDIR= ${.CURDIR:H}/libbsnmptools
.endif
LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a
Modified: head/usr.sbin/camdd/Makefile
==============================================================================
--- head/usr.sbin/camdd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/camdd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
PROG= camdd
SRCS= camdd.c
-SDIR= ${.CURDIR}/../../sys
+SDIR= ${SRCTOP}/sys
LIBADD= cam mt util pthread
NO_WTHREAD_SAFETY= 1
MAN= camdd.8
Modified: head/usr.sbin/ckdist/Makefile
==============================================================================
--- head/usr.sbin/ckdist/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ckdist/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../usr.bin/cksum
+.PATH: ${SRCTOP}/usr.bin/cksum
PROG= ckdist
SRCS= ckdist.c crc.c
Modified: head/usr.sbin/cron/crontab/Makefile
==============================================================================
--- head/usr.sbin/cron/crontab/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/cron/crontab/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -10,7 +10,7 @@ PRECIOUSPROG=
WARNS?= 3
-CFLAGS+= -I${.CURDIR}/../cron
+CFLAGS+= -I${.CURDIR:H}/cron
LIBADD= cron md util
Modified: head/usr.sbin/cron/lib/Makefile
==============================================================================
--- head/usr.sbin/cron/lib/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/cron/lib/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -6,7 +6,7 @@ SRCS= entry.c env.c misc.c
WARNS?= 3
-CFLAGS+= -I${.CURDIR}/../cron
+CFLAGS+= -I${.CURDIR:H}/cron
CFLAGS+= -DLOGIN_CAP -DPAM
.include <bsd.lib.mk>
Modified: head/usr.sbin/ctladm/Makefile
==============================================================================
--- head/usr.sbin/ctladm/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctladm/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,8 +2,8 @@
PROG= ctladm
SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c
-.PATH: ${.CURDIR}/../../sys/cam/ctl
-SDIR= ${.CURDIR}/../../sys
+.PATH: ${SRCTOP}/sys/cam/ctl
+SDIR= ${SRCTOP}/sys
CFLAGS+= -I${SDIR}
# This is necessary because of these warnings:
# warning: cast increases required alignment of target type
Modified: head/usr.sbin/ctld/Makefile
==============================================================================
--- head/usr.sbin/ctld/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctld/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,15 +1,15 @@
# $FreeBSD$
-CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include
-.PATH: ${.CURDIR}/../../contrib/libucl/include
+CFLAGS+=-I${SRCTOP}/contrib/libucl/include
+.PATH: ${SRCTOP}/contrib/libucl/include
PROG= ctld
SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c
SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c
CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../sys/cam/ctl
-CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/sys/cam/ctl
+CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
#CFLAGS+= -DICL_KERNEL_PROXY
MAN= ctld.8 ctl.conf.5
Modified: head/usr.sbin/ctm/Makefile.inc
==============================================================================
--- head/usr.sbin/ctm/Makefile.inc Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctm/Makefile.inc Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,5 +1,5 @@
# $FreeBSD$
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.CURDIR:H:H}/Makefile.inc)
+.include "${.CURDIR:H:H}/Makefile.inc"
.endif
Modified: head/usr.sbin/ctm/ctm/Makefile
==============================================================================
--- head/usr.sbin/ctm/ctm/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctm/ctm/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -18,7 +18,7 @@ LIBADD= md
WARNS?= 2
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"
+.if exists(${.CURDIR:H:H}/Makefile.inc)
+.include "${.CURDIR:H:H}/Makefile.inc"
.endif
.include <bsd.prog.mk>
Modified: head/usr.sbin/ctm/ctm_dequeue/Makefile
==============================================================================
--- head/usr.sbin/ctm/ctm_dequeue/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctm/ctm_dequeue/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../ctm_rmail
+.PATH: ${.CURDIR:H}/ctm_rmail
PROG= ctm_dequeue
MAN=
SRCS= ctm_dequeue.c error.c
-CFLAGS+= -I${.CURDIR}/../ctm_rmail
+CFLAGS+= -I${.CURDIR:H}/ctm_rmail
WARNS?= 1
Modified: head/usr.sbin/ctm/ctm_smail/Makefile
==============================================================================
--- head/usr.sbin/ctm/ctm_smail/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ctm/ctm_smail/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../ctm_rmail
+.PATH: ${.CURDIR:H}/ctm_rmail
PROG= ctm_smail
MAN=
SRCS= ctm_smail.c error.c
-CFLAGS+= -I${.CURDIR}/../ctm_rmail
+CFLAGS+= -I${.CURDIR:H}/ctm_rmail
WARNS?= 2
Modified: head/usr.sbin/dconschat/Makefile
==============================================================================
--- head/usr.sbin/dconschat/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/dconschat/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -3,7 +3,7 @@
PROG= dconschat
MAN= dconschat.8
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
LIBADD= kvm
Modified: head/usr.sbin/editmap/Makefile
==============================================================================
--- head/usr.sbin/editmap/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/editmap/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/editmap
PROG= editmap
Modified: head/usr.sbin/eeprom/Makefile
==============================================================================
--- head/usr.sbin/eeprom/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/eeprom/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,11 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../ofwdump
+.PATH: ${.CURDIR:H}/ofwdump
PROG= eeprom
MAN= eeprom.8
MANSUBDIR= /sparc64
SRCS= eeprom.c ofw_options.c ofw_util.c
-CFLAGS+= -I${.CURDIR}/../ofwdump
+CFLAGS+= -I${.CURDIR:H}/ofwdump
.include <bsd.prog.mk>
Modified: head/usr.sbin/fdcontrol/Makefile
==============================================================================
--- head/usr.sbin/fdcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/fdcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../fdread
+.PATH: ${.CURDIR:H}/fdread
PROG= fdcontrol
SRCS= fdcontrol.c fdutil.c
-CFLAGS+= -I${.CURDIR}/../fdread
+CFLAGS+= -I${.CURDIR:H}/fdread
MAN= fdcontrol.8
.include <bsd.prog.mk>
Modified: head/usr.sbin/fdformat/Makefile
==============================================================================
--- head/usr.sbin/fdformat/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/fdformat/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../fdread
+.PATH: ${.CURDIR:H}/fdread
PROG= fdformat
SRCS= fdformat.c fdutil.c
-CFLAGS+= -I${.CURDIR}/../fdread
+CFLAGS+= -I${.CURDIR:H}/fdread
.include <bsd.prog.mk>
Modified: head/usr.sbin/fmtree/Makefile
==============================================================================
--- head/usr.sbin/fmtree/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/fmtree/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -3,7 +3,7 @@
.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../usr.bin/cksum
+.PATH: ${SRCTOP}/usr.bin/cksum
PROG= fmtree
MAN= fmtree.8
Modified: head/usr.sbin/fstyp/Makefile
==============================================================================
--- head/usr.sbin/fstyp/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/fstyp/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -20,7 +20,7 @@ WARNS?= 2
SUBDIR+= tests
.endif
-CFLAGS+=-I${.CURDIR}/../../sys
+CFLAGS+=-I${SRCTOP}/sys
.if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES
Modified: head/usr.sbin/ftp-proxy/Makefile
==============================================================================
--- head/usr.sbin/ftp-proxy/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ftp-proxy/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,13 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/pf/ftp-proxy
+.PATH: ${SRCTOP}/contrib/pf/ftp-proxy
PROG= ftp-proxy
MAN= ftp-proxy.8
SRCS= ftp-proxy.c filter.c
-CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent
+CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
LIBADD= event
Modified: head/usr.sbin/fwcontrol/Makefile
==============================================================================
--- head/usr.sbin/fwcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/fwcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -5,9 +5,9 @@ SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpeg
MAN= fwcontrol.8
WARNS?= 3
-.PATH: ${.CURDIR}/../../sys/dev/firewire
+.PATH: ${SRCTOP}/sys/dev/firewire
-SDIR= ${.CURDIR}/../../sys
+SDIR= ${SRCTOP}/sys
CFLAGS+=-I${.CURDIR} -I${SDIR}
.include <bsd.prog.mk>
Modified: head/usr.sbin/gpioctl/Makefile
==============================================================================
--- head/usr.sbin/gpioctl/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/gpioctl/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -3,7 +3,7 @@
PROG= gpioctl
MAN= gpioctl.8
-CFLAGS+= -I${.CURDIR}/../../lib/libgpio
+CFLAGS+= -I${SRCTOP}/lib/libgpio
LIBADD= gpio
Modified: head/usr.sbin/gssd/Makefile
==============================================================================
--- head/usr.sbin/gssd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/gssd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -18,7 +18,7 @@ CFLAGS+= -DWITHOUT_KERBEROS
CLEANFILES= gssd_svc.c gssd_xdr.c gssd.h
-RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x
+RPCSRC= ${SRCTOP}/sys/kgssapi/gssd.x
RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M
gssd_svc.c: ${RPCSRC} gssd.h
@@ -30,6 +30,6 @@ gssd_xdr.c: ${RPCSRC} gssd.h
gssd.h: ${RPCSRC}
${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
-.PATH: ${.CURDIR}/../../sys/kgssapi
+.PATH: ${SRCTOP}/sys/kgssapi
.include <bsd.prog.mk>
Modified: head/usr.sbin/hyperv/tools/kvp/Makefile
==============================================================================
--- head/usr.sbin/hyperv/tools/kvp/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/hyperv/tools/kvp/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,12 +2,12 @@
.include <bsd.own.mk>
-HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools
-.PATH: ${HV_KVP_DAEMON_DISTDIR}
+HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools
+.PATH: ${HV_KVP_DAEMON_DISTDIR}
PROG= hv_kvp_daemon
-MAN= hv_kvp_daemon.8
+MAN= hv_kvp_daemon.8
-CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities
.include <bsd.prog.mk>
Modified: head/usr.sbin/hyperv/tools/vss/Makefile
==============================================================================
--- head/usr.sbin/hyperv/tools/vss/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/hyperv/tools/vss/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -3,12 +3,12 @@ DIRDEPS = lib/libc
.include <bsd.own.mk>
-HV_VSS_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools
-.PATH: ${HV_VSS_DAEMON_DISTDIR}
+HV_VSS_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools
+.PATH: ${HV_VSS_DAEMON_DISTDIR}
PROG= hv_vss_daemon
-MAN= hv_vss_daemon.8
+MAN= hv_vss_daemon.8
-CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities
+CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities
.include <bsd.prog.mk>
Modified: head/usr.sbin/iovctl/Makefile
==============================================================================
--- head/usr.sbin/iovctl/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/iovctl/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,7 +4,7 @@ PROG= iovctl
SRCS= iovctl.c parse.c validate.c
LIBADD= nv ucl m
-CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include
+CFLAGS+=-I${SRCTOP}/contrib/libucl/include
WARNS?=6
Modified: head/usr.sbin/ipfwpcap/Makefile
==============================================================================
--- head/usr.sbin/ipfwpcap/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ipfwpcap/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -7,7 +7,7 @@
PROG= ipfwpcap
LIBADD= pcap
-CFLAGS+=-I${.CURDIR}/../../contrib/libpcap
+CFLAGS+=-I${SRCTOP}/contrib/libpcap
MAN= ipfwpcap.8
Modified: head/usr.sbin/iscsid/Makefile
==============================================================================
--- head/usr.sbin/iscsid/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/iscsid/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,8 +4,8 @@ PACKAGE= iscsi
PROG= iscsid
SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c
CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/../../sys/cam
-CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi
+CFLAGS+= -I${SRCTOP}/sys/cam
+CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
CFLAGS+= -DICL_KERNEL_PROXY
MAN= iscsid.8
Modified: head/usr.sbin/mailstats/Makefile
==============================================================================
--- head/usr.sbin/mailstats/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mailstats/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$
-SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mailstats
PROG= mailstats
Modified: head/usr.sbin/mailwrapper/Makefile
==============================================================================
--- head/usr.sbin/mailwrapper/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mailwrapper/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -27,7 +27,7 @@ SYMLINKS+= ${BINDIR}/mailwrapper /bin/rm
.if ${MK_MAILWRAPPER} != "no"
.if !exists(${DESTDIR}/etc/mail/mailer.conf)
-FILES= ${.CURDIR}/../../etc/mail/mailer.conf
+FILES= ${SRCTOP}/etc/mail/mailer.conf
FILESDIR= /etc/mail
FILESMODE= 644
.endif
Modified: head/usr.sbin/makemap/Makefile
==============================================================================
--- head/usr.sbin/makemap/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/makemap/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.4 (Berkeley) 6/10/97
# $FreeBSD$
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/makemap
PROG= makemap
Modified: head/usr.sbin/mlxcontrol/Makefile
==============================================================================
--- head/usr.sbin/mlxcontrol/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mlxcontrol/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,7 +4,7 @@ PROG= mlxcontrol
MAN= mlxcontrol.8
SRCS= command.c config.c interface.c util.c
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
WARNS?= 2
Modified: head/usr.sbin/mount_smbfs/Makefile
==============================================================================
--- head/usr.sbin/mount_smbfs/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mount_smbfs/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,8 +4,8 @@ PROG= mount_smbfs
SRCS= mount_smbfs.c getmntopts.c
MAN= mount_smbfs.8
-MOUNTDIR= ${.CURDIR}/../../sbin/mount
-CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
+MOUNTDIR= ${SRCTOP}/sbin/mount
+CONTRIBDIR= ${SRCTOP}/contrib/smbfs
CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
LIBADD= smb
Modified: head/usr.sbin/mountd/Makefile
==============================================================================
--- head/usr.sbin/mountd/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mountd/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -5,7 +5,7 @@ PROG= mountd
SRCS= mountd.c getmntopts.c
MAN= exports.5 netgroup.5 mountd.8
-MOUNT= ${.CURDIR}/../../sbin/mount
+MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+= -I${MOUNT}
WARNS?= 2
Modified: head/usr.sbin/mpsutil/Makefile
==============================================================================
--- head/usr.sbin/mpsutil/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/mpsutil/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -10,7 +10,7 @@ WARNS?= 3
LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil
MLINKS= mpsutil.8 mprutil.8
-CFLAGS+= -I${.CURDIR}/../../sys -I. -DUSE_MPT_IOCTLS
+CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS
# Avoid dirdep dependency on libutil
CFLAGS+= -I${SRCTOP}/lib/libutil
Modified: head/usr.sbin/ndiscvt/Makefile
==============================================================================
--- head/usr.sbin/ndiscvt/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ndiscvt/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/compat/ndis
+.PATH: ${SRCTOP}/sys/compat/ndis
PROG= ndiscvt
SRCS= ndiscvt.c
@@ -17,7 +17,7 @@ LIBADD= l
YFLAGS+=-v
-CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys
CLEANFILES= y.output
Modified: head/usr.sbin/ndp/Makefile
==============================================================================
--- head/usr.sbin/ndp/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/ndp/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -13,13 +13,13 @@
# A PARTICULAR PURPOSE.
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/tcpdump
+.PATH: ${SRCTOP}/contrib/tcpdump
PROG= ndp
MAN= ndp.8
SRCS= ndp.c gmt2local.c
-CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump
+CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump
CFLAGS+= -D_U_=""
WARNS?= 1
Modified: head/usr.sbin/nmtree/Makefile
==============================================================================
--- head/usr.sbin/nmtree/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/nmtree/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,18 +2,18 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../contrib/mtree
+.PATH: ${SRCTOP}/contrib/mtree
PROG= mtree
MAN= mtree.5 mtree.8
SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
only.c spec.c specspec.c verify.c
-CFLAGS+= -I${.CURDIR}/../../contrib/mknod
-.PATH: ${.CURDIR}/../../contrib/mknod
+CFLAGS+= -I${SRCTOP}/contrib/mknod
+.PATH: ${SRCTOP}/contrib/mknod
SRCS+= pack_dev.c
-CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
+CFLAGS+= -I${SRCTOP}/lib/libnetbsd
LIBADD= netbsd md util
LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree
Modified: head/usr.sbin/pkg/Makefile
==============================================================================
--- head/usr.sbin/pkg/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/pkg/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,8 +4,8 @@ PROG= pkg
SRCS= pkg.c dns_utils.c config.c
MAN= pkg.7
-CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include
-.PATH: ${.CURDIR}/../../contrib/libucl/include
+CFLAGS+=-I${SRCTOP}/contrib/libucl/include
+.PATH: ${SRCTOP}/contrib/libucl/include
LIBADD= archive fetch ucl sbuf crypto ssl
.include <bsd.prog.mk>
Modified: head/usr.sbin/pnpinfo/Makefile
==============================================================================
--- head/usr.sbin/pnpinfo/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/pnpinfo/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,11 +1,11 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/pnpinfo
+.PATH: ${SRCTOP}/contrib/pnpinfo
PROG= pnpinfo
MAN= pnpinfo.8
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
WARNS?= 2
Modified: head/usr.sbin/praliases/Makefile
==============================================================================
--- head/usr.sbin/praliases/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/praliases/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$
-SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/praliases
PROG= praliases
Modified: head/usr.sbin/praudit/Makefile
==============================================================================
--- head/usr.sbin/praudit/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/praudit/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
# $FreeBSD$
#
-OPENBSMDIR=${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/praudit
PROG= praudit
Modified: head/usr.sbin/pwd_mkdb/Makefile
==============================================================================
--- head/usr.sbin/pwd_mkdb/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/pwd_mkdb/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,12 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/gen # for pw_scan.c
+.PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
PROG= pwd_mkdb
MAN= pwd_mkdb.8
SRCS= pw_scan.c pwd_mkdb.c
-CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h
+CFLAGS+= -I${SRCTOP}/lib/libc/gen # for pw_scan.h
.include <bsd.prog.mk>
Modified: head/usr.sbin/rip6query/Makefile
==============================================================================
--- head/usr.sbin/rip6query/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/rip6query/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,6 +4,6 @@
PROG= rip6query
MAN= rip6query.8
-CFLAGS+= -I${.CURDIR}/../route6d
+CFLAGS+= -I${.CURDIR:H}/route6d
.include <bsd.prog.mk>
Modified: head/usr.sbin/rpcbind/tests/Makefile
==============================================================================
--- head/usr.sbin/rpcbind/tests/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/rpcbind/tests/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/..
ATF_TESTS_C= addrmerge_test
-CFLAGS+= -I${.CURDIR}/.. -Wno-cast-qual
+CFLAGS+= -I${.CURDIR:H} -Wno-cast-qual
SRCS.addrmerge_test= addrmerge_test.c util.c
.if ${MK_INET6_SUPPORT} != "no"
Modified: head/usr.sbin/rtadvctl/Makefile
==============================================================================
--- head/usr.sbin/rtadvctl/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/rtadvctl/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,13 +1,13 @@
# $FreeBSD$
#
-.PATH: ${.CURDIR}/../rtadvd
+.PATH: ${.CURDIR:H}/rtadvd
PROG= rtadvctl
MAN= rtadvctl.8
SRCS= rtadvctl.c control.c control_client.c if.c timer_subr.c
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../rtadvd
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/rtadvd
WARNS?= 1
.include <bsd.prog.mk>
Modified: head/usr.sbin/sa/Makefile
==============================================================================
--- head/usr.sbin/sa/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/sa/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../usr.bin/lastcomm
+.PATH: ${SRCTOP}/usr.bin/lastcomm
PROG= sa
MAN= sa.8
Modified: head/usr.sbin/sendmail/Makefile
==============================================================================
--- head/usr.sbin/sendmail/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/sendmail/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -4,14 +4,14 @@
.include <src.opts.mk>
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR}
BINDIR= ${LIBEXECDIR}/sendmail
PROG= sendmail
-MAN= mailq.1 newaliases.1 aliases.5 sendmail.8
+MAN= mailq.1 newaliases.1 aliases.5 sendmail.8
MLINKS+=sendmail.8 hoststat.8
MLINKS+=sendmail.8 purgestat.8
SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \
Modified: head/usr.sbin/tcpdump/tcpdump/Makefile
==============================================================================
--- head/usr.sbin/tcpdump/tcpdump/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/tcpdump/tcpdump/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump
+TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump
.PATH: ${TCPDUMP_DISTDIR}
PROG= tcpdump
Modified: head/usr.sbin/timed/timedc/Makefile
==============================================================================
--- head/usr.sbin/timed/timedc/Makefile Sat Mar 4 11:35:30 2017 (r314658)
+++ head/usr.sbin/timed/timedc/Makefile Sat Mar 4 11:38:03 2017 (r314659)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-.PATH: ${.CURDIR}/../timed
+.PATH: ${.CURDIR:H}/timed
PROG= timedc
MAN= timedc.8
More information about the svn-src-head
mailing list