Author: ngie
Date: Sat Mar 4 11:33:01 2017
New Revision: 314656
URL: https://svnweb.freebsd.org/changeset/base/314656
Log:
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/sbin/atm/atmconfig/Makefile
head/sbin/bsdlabel/Makefile
head/sbin/decryptcore/Makefile
head/sbin/dhclient/tests/Makefile
head/sbin/etherswitchcfg/Makefile
head/sbin/fdisk/Makefile
head/sbin/ffsinfo/Makefile
head/sbin/fsck_ffs/Makefile
head/sbin/fsck_msdosfs/Makefile
head/sbin/fsdb/Makefile
head/sbin/gbde/Makefile
head/sbin/geom/class/Makefile.inc
head/sbin/geom/class/cache/Makefile
head/sbin/geom/class/concat/Makefile
head/sbin/geom/class/eli/Makefile
head/sbin/geom/class/journal/Makefile
head/sbin/geom/class/label/Makefile
head/sbin/geom/class/mirror/Makefile
head/sbin/geom/class/mountver/Makefile
head/sbin/geom/class/multipath/Makefile
head/sbin/geom/class/nop/Makefile
head/sbin/geom/class/part/Makefile
head/sbin/geom/class/raid/Makefile
head/sbin/geom/class/raid3/Makefile
head/sbin/geom/class/sched/Makefile
head/sbin/geom/class/shsec/Makefile
head/sbin/geom/class/stripe/Makefile
head/sbin/geom/class/virstor/Makefile
head/sbin/geom/core/Makefile
head/sbin/ggate/ggatec/Makefile
head/sbin/ggate/ggated/Makefile
head/sbin/ggate/ggatel/Makefile
head/sbin/growfs/Makefile
head/sbin/gvinum/Makefile
head/sbin/hastctl/Makefile
head/sbin/init/Makefile
head/sbin/ipf/Makefile.inc
head/sbin/ipf/ipf/Makefile
head/sbin/ipf/ipftest/Makefile
head/sbin/ipf/ipresend/Makefile
head/sbin/iscontrol/Makefile
head/sbin/ldconfig/Makefile
head/sbin/mksnap_ffs/Makefile
head/sbin/mount_cd9660/Makefile
head/sbin/mount_fusefs/Makefile
head/sbin/mount_msdosfs/Makefile
head/sbin/mount_nfs/Makefile
head/sbin/mount_nullfs/Makefile
head/sbin/mount_udf/Makefile
head/sbin/mount_unionfs/Makefile
head/sbin/newfs/Makefile
head/sbin/nvmecontrol/Makefile
head/sbin/pfctl/Makefile
head/sbin/pflogd/Makefile
head/sbin/quotacheck/Makefile
head/sbin/resolvconf/Makefile
head/sbin/restore/Makefile
head/sbin/rtsol/Makefile
head/sbin/setkey/Makefile
head/sbin/sunlabel/Makefile
head/sbin/umount/Makefile
Modified: head/sbin/atm/atmconfig/Makefile
==============================================================================
--- head/sbin/atm/atmconfig/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/atm/atmconfig/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -34,8 +34,8 @@ WARNS?= 3
FILES= atmconfig.help atmconfig_device.help
FILESDIR= ${SHAREDIR}/doc/atm
-SNMP_ATM_DEF= ${.CURDIR}/../../../contrib/ngatm/snmp_atm/atm_tree.def \
- ${.CURDIR}/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
+SNMP_ATM_DEF= ${SRCTOP}/contrib/ngatm/snmp_atm/atm_tree.def \
+ ${SRCTOP}/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
oid.h: atm_oid.list ${SNMP_ATM_DEF}
cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2
${.CURDIR}/atm_oid.list` \
Modified: head/sbin/bsdlabel/Makefile
==============================================================================
--- head/sbin/bsdlabel/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/bsdlabel/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 3/17/94
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PACKAGE=runtime
PROG= bsdlabel
Modified: head/sbin/decryptcore/Makefile
==============================================================================
--- head/sbin/decryptcore/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/decryptcore/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -6,7 +6,7 @@ LIBADD= crypto pjdlog
MAN= decryptcore.8
-CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog
+CFLAGS+=-I${SRCTOP}/lib/libpjdlog
WARNS?= 6
Modified: head/sbin/dhclient/tests/Makefile
==============================================================================
--- head/sbin/dhclient/tests/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/dhclient/tests/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -5,7 +5,7 @@
PLAIN_TESTS_C= option-domain-search_test
SRCS.option-domain-search_test= alloc.c convert.c hash.c
options.c \
tables.c fake.c option-domain-search.c
-CFLAGS.option-domain-search_test+= -I${.CURDIR}/..
+CFLAGS.option-domain-search_test+= -I${.CURDIR:H}
LIBADD.option-domain-search_test= util
WARNS?= 2
Modified: head/sbin/etherswitchcfg/Makefile
==============================================================================
--- head/sbin/etherswitchcfg/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/etherswitchcfg/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -5,6 +5,6 @@ PACKAGE=runtime
PROG= etherswitchcfg
MAN= etherswitchcfg.8
SRCS= etherswitchcfg.c ifmedia.c
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
.include <bsd.prog.mk>
Modified: head/sbin/fdisk/Makefile
==============================================================================
--- head/sbin/fdisk/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/fdisk/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -6,7 +6,7 @@ SRCS= fdisk.c geom_mbr_enc.c
WARNS?= 4
MAN= fdisk.8
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
LIBADD= geom
Modified: head/sbin/ffsinfo/Makefile
==============================================================================
--- head/sbin/ffsinfo/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/ffsinfo/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -4,7 +4,7 @@
# $FreeBSD$
#
-GROWFS= ${.CURDIR}/../growfs
+GROWFS= ${.CURDIR:H}/growfs
.PATH: ${GROWFS}
PACKAGE=runtime
Modified: head/sbin/fsck_ffs/Makefile
==============================================================================
--- head/sbin/fsck_ffs/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/fsck_ffs/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -12,8 +12,8 @@ SRCS= dir.c ea.c fsutil.c inode.c main.c
globs.c
LIBADD= ufs
WARNS?= 2
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mount
+CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/mount
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
+.PATH: ${SRCTOP}/sys/ufs/ffs ${.CURDIR:H}/mount
.include <bsd.prog.mk>
Modified: head/sbin/fsck_msdosfs/Makefile
==============================================================================
--- head/sbin/fsck_msdosfs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/fsck_msdosfs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
# $FreeBSD$
-FSCK= ${.CURDIR}/../fsck
+FSCK= ${.CURDIR:H}/fsck
.PATH: ${FSCK}
PACKAGE=runtime
Modified: head/sbin/fsdb/Makefile
==============================================================================
--- head/sbin/fsdb/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/fsdb/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -8,9 +8,9 @@ MAN= fsdb.8
SRCS= fsdb.c fsdbutil.c \
dir.c ea.c fsutil.c inode.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c
-CFLAGS+= -I${.CURDIR}/../fsck_ffs
+CFLAGS+= -I${.CURDIR:H}/fsck_ffs
WARNS?= 2
LIBADD= edit
-.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${.CURDIR:H}/fsck_ffs ${SRCTOP}/sys/ufs/ffs
.include <bsd.prog.mk>
Modified: head/sbin/gbde/Makefile
==============================================================================
--- head/sbin/gbde/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/gbde/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -13,10 +13,10 @@ SRCS+= g_bde_lock.c
NO_WCAST_ALIGN=
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+= -I${.CURDIR}/../../sys
-.PATH: ${.CURDIR}/../../sys/geom/bde \
- ${.CURDIR}/../../sys/crypto/rijndael \
- ${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys
+.PATH: ${SRCTOP}/sys/geom/bde \
+ ${SRCTOP}/sys/crypto/rijndael \
+ ${SRCTOP}/sys/crypto/sha2
CLEANFILES+= template.c
Modified: head/sbin/geom/class/Makefile.inc
==============================================================================
--- head/sbin/geom/class/Makefile.inc Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/Makefile.inc Sat Mar 4 11:33:01 2017
(r314656)
@@ -8,6 +8,6 @@ SRCS+= geom_${GEOM_CLASS}.c subr.c
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+= -I${.CURDIR}/../..
+CFLAGS+= -I${.CURDIR:H:H}
.include "../Makefile.inc"
Modified: head/sbin/geom/class/cache/Makefile
==============================================================================
--- head/sbin/geom/class/cache/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/cache/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= cache
Modified: head/sbin/geom/class/concat/Makefile
==============================================================================
--- head/sbin/geom/class/concat/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/concat/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= concat
Modified: head/sbin/geom/class/eli/Makefile
==============================================================================
--- head/sbin/geom/class/eli/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/eli/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli
${.CURDIR}/../../../../sys/crypto/sha2
+.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2
GEOM_CLASS= eli
SRCS= g_eli_crypto.c
@@ -15,6 +15,6 @@ LIBADD= md crypto
WARNS?= 3
-CFLAGS+=-I${.CURDIR}/../../../../sys
+CFLAGS+=-I${SRCTOP}/sys
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/journal/Makefile
==============================================================================
--- head/sbin/geom/class/journal/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/journal/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,13 +1,13 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= journal
SRCS+= geom_journal_ufs.c
LIBADD= ufs md
-CFLAGS+=-I${.CURDIR}/../../../../sys
+CFLAGS+=-I${SRCTOP}/sys
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/label/Makefile
==============================================================================
--- head/sbin/geom/class/label/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/label/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= label
Modified: head/sbin/geom/class/mirror/Makefile
==============================================================================
--- head/sbin/geom/class/mirror/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/mirror/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mirror
Modified: head/sbin/geom/class/mountver/Makefile
==============================================================================
--- head/sbin/geom/class/mountver/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/mountver/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= mountver
Modified: head/sbin/geom/class/multipath/Makefile
==============================================================================
--- head/sbin/geom/class/multipath/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/multipath/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,10 +1,10 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= multipath
-CFLAGS+= -I${.CURDIR}/../../../../sys
+CFLAGS+= -I${SRCTOP}/sys
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/nop/Makefile
==============================================================================
--- head/sbin/geom/class/nop/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/nop/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= nop
Modified: head/sbin/geom/class/part/Makefile
==============================================================================
--- head/sbin/geom/class/part/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/part/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= part
Modified: head/sbin/geom/class/raid/Makefile
==============================================================================
--- head/sbin/geom/class/raid/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/raid/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid
Modified: head/sbin/geom/class/raid3/Makefile
==============================================================================
--- head/sbin/geom/class/raid3/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/raid3/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= raid3
Modified: head/sbin/geom/class/sched/Makefile
==============================================================================
--- head/sbin/geom/class/sched/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/sched/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -2,7 +2,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= sched
Modified: head/sbin/geom/class/shsec/Makefile
==============================================================================
--- head/sbin/geom/class/shsec/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/shsec/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= shsec
Modified: head/sbin/geom/class/stripe/Makefile
==============================================================================
--- head/sbin/geom/class/stripe/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/stripe/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc
+.PATH: ${.CURDIR:H:H}/misc
GEOM_CLASS= stripe
Modified: head/sbin/geom/class/virstor/Makefile
==============================================================================
--- head/sbin/geom/class/virstor/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/class/virstor/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
+.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor
GEOM_CLASS= virstor
Modified: head/sbin/geom/core/Makefile
==============================================================================
--- head/sbin/geom/core/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/geom/core/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../misc
+.PATH: ${.CURDIR:H}/misc
PACKAGE=runtime
PROG= geom
@@ -10,7 +10,7 @@ SRCS= geom.c subr.c
NO_SHARED=NO
CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\"
-CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys -I${.CURDIR} -I${.CURDIR:H}
LIBADD= geom util
Modified: head/sbin/ggate/ggatec/Makefile
==============================================================================
--- head/sbin/ggate/ggatec/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/ggate/ggatec/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggatec
MAN= ggatec.8
@@ -8,7 +8,7 @@ SRCS= ggatec.c ggate.c
CFLAGS+= -DMAX_SEND_SIZE=32768
CFLAGS+= -DLIBGEOM
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
LIBADD= geom util pthread
Modified: head/sbin/ggate/ggated/Makefile
==============================================================================
--- head/sbin/ggate/ggated/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/ggate/ggated/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggated
MAN= ggated.8
@@ -8,6 +8,6 @@ SRCS= ggated.c ggate.c
LIBADD= pthread util
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
.include <bsd.prog.mk>
Modified: head/sbin/ggate/ggatel/Makefile
==============================================================================
--- head/sbin/ggate/ggatel/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/ggate/ggatel/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,13 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../shared
+.PATH: ${.CURDIR:H}/shared
PROG= ggatel
MAN= ggatel.8
SRCS= ggatel.c ggate.c
CFLAGS+= -DLIBGEOM
-CFLAGS+= -I${.CURDIR}/../shared
+CFLAGS+= -I${.CURDIR:H}/shared
LIBADD= geom util
Modified: head/sbin/growfs/Makefile
==============================================================================
--- head/sbin/growfs/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/growfs/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -6,19 +6,19 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../mount
+.PATH: ${.CURDIR:H}/mount
PACKAGE=runtime
PROG= growfs
SRCS= growfs.c getmntopts.c
MAN= growfs.8
-CFLAGS+=-I${.CURDIR}/../mount
+CFLAGS+=-I${.CURDIR:H}/mount
.if defined(GFSDBG)
SRCS+= debug.c
CFLAGS+= -DFS_DEBUG
NO_WCAST_ALIGN= yes
-.endif
+.endif
LIBADD= util
Modified: head/sbin/gvinum/Makefile
==============================================================================
--- head/sbin/gvinum/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/gvinum/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -6,10 +6,10 @@ SRCS= gvinum.c gvinum.h geom_vinum_share
MAN= gvinum.8
WARNS?= 2
-CFLAGS+= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
+CFLAGS+= -I${SRCTOP}/sys -I${DESTDIR}/${INCLUDEDIR}/edit
LIBADD= edit geom
-.PATH: ${.CURDIR}/../../sys/geom/vinum
+.PATH: ${SRCTOP}/sys/geom/vinum
.include <bsd.prog.mk>
Modified: head/sbin/hastctl/Makefile
==============================================================================
--- head/sbin/hastctl/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/hastctl/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PACKAGE=hast
-.PATH: ${.CURDIR}/../hastd
+.PATH: ${.CURDIR:H}/hastd
PROG= hastctl
SRCS= activemap.c
@@ -23,7 +23,7 @@ MAN= hastctl.8
NO_WFORMAT=
NO_WCAST_ALIGN=
NO_WMISSING_VARIABLE_DECLARATIONS=
-CFLAGS+=-I${.CURDIR}/../hastd
+CFLAGS+=-I${.CURDIR:H}/hastd
CFLAGS+=-DHAVE_CAPSICUM
CFLAGS+=-DINET
.if ${MK_INET6_SUPPORT} != "no"
Modified: head/sbin/init/Makefile
==============================================================================
--- head/sbin/init/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/init/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -11,7 +11,7 @@ CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CA
LIBADD= util crypt
# Needed for getmntopts.c
-MOUNT= ${.CURDIR}/../../sbin/mount
+MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
Modified: head/sbin/ipf/Makefile.inc
==============================================================================
--- head/sbin/ipf/Makefile.inc Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/ipf/Makefile.inc Sat Mar 4 11:33:01 2017 (r314656)
@@ -6,10 +6,10 @@ WARNS?= 2
NO_WFORMAT=
NO_WARRAY_BOUNDS=
-CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter
-CFLAGS+= -I${.CURDIR}/../../../contrib/ipfilter/tools
-CFLAGS+= -I${.CURDIR}/../../../sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/ipfilter
+CFLAGS+= -I${SRCTOP}/contrib/ipfilter
+CFLAGS+= -I${SRCTOP}/contrib/ipfilter/tools
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter
CFLAGS+= -DSTATETOP -D__UIO_EXPOSE
.if ${MK_INET6_SUPPORT} != "no"
@@ -24,9 +24,9 @@ LIBADD+= ipf
CLEANFILES+= y.tab.c y.tab.h
-.PATH: ${.CURDIR}/../../../contrib/ipfilter \
- ${.CURDIR}/../../../contrib/ipfilter/lib \
- ${.CURDIR}/../../../contrib/ipfilter/tools \
- ${.CURDIR}/../../../contrib/ipfilter/man
+.PATH: ${SRCTOP}/contrib/ipfilter \
+ ${SRCTOP}/contrib/ipfilter/lib \
+ ${SRCTOP}/contrib/ipfilter/tools \
+ ${SRCTOP}/contrib/ipfilter/man
.include "../Makefile.inc"
Modified: head/sbin/ipf/ipf/Makefile
==============================================================================
--- head/sbin/ipf/ipf/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/ipf/ipf/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -31,7 +31,7 @@ ipf_l.h: lexer.h
${.ALLSRC} > ${.TARGET}
.if defined(RESCUE)
-LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS
+LIBIPF_SRCS!= cd ${.CURDIR:H}/libipf && ${MAKE} -V SRCS
SRCS+= ${LIBIPF_SRCS}
.else
LIBADD+= pcap
Modified: head/sbin/ipf/ipftest/Makefile
==============================================================================
--- head/sbin/ipf/ipftest/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/ipf/ipftest/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -20,11 +20,11 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPI
# XXX CFLAGS+= -DIPFILTER_SCAN
-.PATH: ${.CURDIR}/../../../sys/contrib/ipfilter/netinet
+.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet
GENHDRS= ipnat_l.h ipnat_y.h ippool_l.h ippool_y.h ipf_l.h ipf_y.h
-CLEANFILES+= ${GENHDRS}
+CLEANFILES+= ${GENHDRS}
CLEANFILES+= ipf_y.c ipf_l.c
CLEANFILES+= ipf.tab.c ipf.tab.h
CLEANFILES+= ipnat_y.c ipnat_l.c
Modified: head/sbin/ipf/ipresend/Makefile
==============================================================================
--- head/sbin/ipf/ipresend/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/ipf/ipresend/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -5,6 +5,6 @@ PROG= ipresend
SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c
MAN= ipresend.1
-.PATH: ${.CURDIR}/../../../contrib/ipfilter/ipsend
+.PATH: ${SRCTOP}/contrib/ipfilter/ipsend
.include <bsd.prog.mk>
Modified: head/sbin/iscontrol/Makefile
==============================================================================
--- head/sbin/iscontrol/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/iscontrol/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -4,7 +4,7 @@ PACKAGE=iscsi_legacy
SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c
PROG= iscontrol
LIBADD= cam md
-S= ${.CURDIR}/../../sys
+S= ${SRCTOP}/sys
WARNS?= 3
CFLAGS+= -I$S
Modified: head/sbin/ldconfig/Makefile
==============================================================================
--- head/sbin/ldconfig/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/ldconfig/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -3,7 +3,7 @@
PACKAGE=runtime
PROG= ldconfig
SRCS= elfhints.c ldconfig.c shlib.c support.c
-LDDIR?= ${.CURDIR}/../../libexec/rtld-aout
+LDDIR?= ${SRCTOP}/libexec/rtld-aout
CFLAGS+=-I${LDDIR} -DFREEBSD_AOUT
MAN= ldconfig.8
Modified: head/sbin/mksnap_ffs/Makefile
==============================================================================
--- head/sbin/mksnap_ffs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mksnap_ffs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../mount
+.PATH: ${.CURDIR:H}/mount
PACKAGE=runtime
PROG= mksnap_ffs
@@ -8,7 +8,7 @@ SRCS= mksnap_ffs.c getmntopts.c
MAN= mksnap_ffs.8
WARNS?= 2
-CFLAGS+=-I${.CURDIR}/../mount
+CFLAGS+=-I${.CURDIR:H}/mount
.if defined(NOSUID)
BINMODE=554
Modified: head/sbin/mount_cd9660/Makefile
==============================================================================
--- head/sbin/mount_cd9660/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_cd9660/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -7,7 +7,7 @@ SRCS= mount_cd9660.c getmntopts.c
MAN= mount_cd9660.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
Modified: head/sbin/mount_fusefs/Makefile
==============================================================================
--- head/sbin/mount_fusefs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_fusefs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -25,7 +25,7 @@ PROG= mount_fusefs
SRCS= mount_fusefs.c getmntopts.c
MAN8= mount_fusefs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}
Modified: head/sbin/mount_msdosfs/Makefile
==============================================================================
--- head/sbin/mount_msdosfs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_msdosfs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -8,7 +8,7 @@ SRCS= mount_msdosfs.c getmntopts.c
MAN= mount_msdosfs.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+= -I${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
Modified: head/sbin/mount_nfs/Makefile
==============================================================================
--- head/sbin/mount_nfs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_nfs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -7,8 +7,8 @@ PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c mounttab.c
MAN= mount_nfs.8
-MOUNT= ${.CURDIR}/../mount
-UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
+MOUNT= ${.CURDIR:H}/mount
+UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall
CFLAGS+= -DNFS -I${MOUNT} -I${UMNTALL}
.PATH: ${MOUNT} ${UMNTALL}
Modified: head/sbin/mount_nullfs/Makefile
==============================================================================
--- head/sbin/mount_nullfs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_nullfs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -6,7 +6,7 @@ PROG= mount_nullfs
SRCS= mount_nullfs.c getmntopts.c
MAN= mount_nullfs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
Modified: head/sbin/mount_udf/Makefile
==============================================================================
--- head/sbin/mount_udf/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_udf/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -6,8 +6,8 @@ SRCS= mount_udf.c getmntopts.c
MAN= mount_udf.8
LIBADD= kiconv
-MOUNT= ${.CURDIR}/../mount
-CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys
+MOUNT= ${.CURDIR:H}/mount
+CFLAGS+= -I${MOUNT} -I${SRCTOP}/sys
.PATH: ${MOUNT}
# Needs to be dynamically linked for optional dlopen() access to
Modified: head/sbin/mount_unionfs/Makefile
==============================================================================
--- head/sbin/mount_unionfs/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/mount_unionfs/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -6,7 +6,7 @@ PROG= mount_unionfs
SRCS= mount_unionfs.c getmntopts.c
MAN= mount_unionfs.8
-MOUNT= ${.CURDIR}/../mount
+MOUNT= ${.CURDIR:H}/mount
CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
Modified: head/sbin/newfs/Makefile
==============================================================================
--- head/sbin/newfs/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/newfs/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 3/27/94
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PROG= newfs
LIBADD= ufs util
@@ -13,7 +13,7 @@ MAN= newfs.8
.include <bsd.prog.mk>
test: ${PROG}
- sh ${.CURDIR}/runtest01.sh
+ sh ${.CURDIR}/runtest01.sh
sh ${.CURDIR}/runtest00.sh | tee _.test
diff --ignore-matching-lines=FreeBSD _.test ${.CURDIR}/ref.test
echo All Tests Passed
Modified: head/sbin/nvmecontrol/Makefile
==============================================================================
--- head/sbin/nvmecontrol/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/nvmecontrol/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -6,6 +6,6 @@ SRCS= nvmecontrol.c devlist.c firmware.c
perftest.c reset.c nvme_util.c power.c wdc.c
MAN= nvmecontrol.8
-.PATH: ${.CURDIR}/../../sys/dev/nvme
+.PATH: ${SRCTOP}/sys/dev/nvme
.include <bsd.prog.mk>
Modified: head/sbin/pfctl/Makefile
==============================================================================
--- head/sbin/pfctl/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/pfctl/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
# pf_ruleset.c is shared between kernel and pfctl
-.PATH: ${.CURDIR}/../../sys/netpfil/pf
+.PATH: ${SRCTOP}/sys/netpfil/pf
PACKAGE=pf
PROG= pfctl
Modified: head/sbin/pflogd/Makefile
==============================================================================
--- head/sbin/pflogd/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/pflogd/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -1,14 +1,14 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/pf/pflogd
+.PATH: ${SRCTOP}/contrib/pf/pflogd
PACKAGE=pf
PROG= pflogd
SRCS= pflogd.c pidfile.c privsep.c privsep_fdpass.c
MAN= pflogd.8
-CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
-CFLAGS+=-I${.CURDIR}/../../contrib/libpcap
+CFLAGS+=-include ${SRCTOP}/lib/libpcap/config.h
+CFLAGS+=-I${SRCTOP}/contrib/libpcap
LIBADD= pcap
Modified: head/sbin/quotacheck/Makefile
==============================================================================
--- head/sbin/quotacheck/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/quotacheck/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -8,6 +8,6 @@ WARNS?= 2
MAN= quotacheck.8
LIBADD= util
-.PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs
+.PATH: ${.CURDIR:H}/fsck ${.CURDIR:H}/fsck_ffs
.include <bsd.prog.mk>
Modified: head/sbin/resolvconf/Makefile
==============================================================================
--- head/sbin/resolvconf/Makefile Sat Mar 4 11:31:08 2017
(r314655)
+++ head/sbin/resolvconf/Makefile Sat Mar 4 11:33:01 2017
(r314656)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=runtime
-DIST= ${.CURDIR}/../../contrib/openresolv
+DIST= ${SRCTOP}/contrib/openresolv
.PATH: ${DIST}
SCRIPTS= resolvconf
Modified: head/sbin/restore/Makefile
==============================================================================
--- head/sbin/restore/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/restore/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# $FreeBSD$
-.PATH: ${.CURDIR}/../dump
+.PATH: ${.CURDIR:H}/dump
PACKAGE=runtime
PROG= restore
Modified: head/sbin/rtsol/Makefile
==============================================================================
--- head/sbin/rtsol/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/rtsol/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -14,7 +14,7 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../../usr.sbin/rtsold
+.PATH: ${SRCTOP}/usr.sbin/rtsold
PACKAGE=runtime
PROG= rtsol
Modified: head/sbin/setkey/Makefile
==============================================================================
--- head/sbin/setkey/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/setkey/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -35,7 +35,7 @@ MAN= setkey.8
SRCS= setkey.c parse.y token.l
WARNS?= 1
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libipsec
YFLAGS= -d
LIBADD= l y
@@ -44,9 +44,9 @@ CLEANFILES= y.tab.c y.tab.h key_test.o k
# libpfkey
# ipsec_strerror.c is for avoiding shlib reference to non-exported function.
-.PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netipsec
+.PATH: ${SRCTOP}/lib/libipsec ${SRCTOP}/sys/netipsec
SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c
-CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netipsec
+CFLAGS+= -I${SRCTOP}/lib/libipsec -I${SRCTOP}/sys/netipsec
SRCS+= y.tab.h
y.tab.h: parse.y
Modified: head/sbin/sunlabel/Makefile
==============================================================================
--- head/sbin/sunlabel/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/sunlabel/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../sys/geom
+.PATH: ${SRCTOP}/sys/geom
PROG= sunlabel
SRCS= sunlabel.c geom_sunlabel_enc.c
Modified: head/sbin/umount/Makefile
==============================================================================
--- head/sbin/umount/Makefile Sat Mar 4 11:31:08 2017 (r314655)
+++ head/sbin/umount/Makefile Sat Mar 4 11:33:01 2017 (r314656)
@@ -7,8 +7,8 @@ PROG= umount
SRCS= umount.c vfslist.c mounttab.c
MAN= umount.8
-MOUNT= ${.CURDIR}/../mount
-UMNTALL= ${.CURDIR}/../../usr.sbin/rpc.umntall
+MOUNT= ${.CURDIR:H}/mount
+UMNTALL= ${SRCTOP}/usr.sbin/rpc.umntall
CFLAGS+= -I${MOUNT} -I${UMNTALL}
.PATH: ${MOUNT} ${UMNTALL}
_______________________________________________
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"
