Date: Tue, 30 May 2017 04:17:22 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319185 - in stable/11/sbin: atm/atmconfig bsdlabel dhclient/tests etherswitchcfg fdisk ffsinfo fsck_ffs fsck_msdosfs fsdb gbde geom/class geom/class/cache geom/class/concat geom/class/... Message-ID: <201705300417.v4U4HMQF082473@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Tue May 30 04:17:22 2017 New Revision: 319185 URL: https://svnweb.freebsd.org/changeset/base/319185 Log: MFC r314655: bin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output Modified: stable/11/sbin/atm/atmconfig/Makefile stable/11/sbin/bsdlabel/Makefile stable/11/sbin/dhclient/tests/Makefile stable/11/sbin/etherswitchcfg/Makefile stable/11/sbin/fdisk/Makefile stable/11/sbin/ffsinfo/Makefile stable/11/sbin/fsck_ffs/Makefile stable/11/sbin/fsck_msdosfs/Makefile stable/11/sbin/fsdb/Makefile stable/11/sbin/gbde/Makefile stable/11/sbin/geom/class/Makefile.inc stable/11/sbin/geom/class/cache/Makefile stable/11/sbin/geom/class/concat/Makefile stable/11/sbin/geom/class/eli/Makefile stable/11/sbin/geom/class/journal/Makefile stable/11/sbin/geom/class/label/Makefile stable/11/sbin/geom/class/mirror/Makefile stable/11/sbin/geom/class/mountver/Makefile stable/11/sbin/geom/class/multipath/Makefile stable/11/sbin/geom/class/nop/Makefile stable/11/sbin/geom/class/part/Makefile stable/11/sbin/geom/class/raid/Makefile stable/11/sbin/geom/class/raid3/Makefile stable/11/sbin/geom/class/sched/Makefile stable/11/sbin/geom/class/shsec/Makefile stable/11/sbin/geom/class/stripe/Makefile stable/11/sbin/geom/class/virstor/Makefile stable/11/sbin/geom/core/Makefile stable/11/sbin/ggate/ggatec/Makefile stable/11/sbin/ggate/ggated/Makefile stable/11/sbin/ggate/ggatel/Makefile stable/11/sbin/growfs/Makefile stable/11/sbin/gvinum/Makefile stable/11/sbin/hastctl/Makefile stable/11/sbin/init/Makefile stable/11/sbin/ipf/Makefile.inc stable/11/sbin/ipf/ipf/Makefile stable/11/sbin/ipf/ipftest/Makefile stable/11/sbin/ipf/ipresend/Makefile stable/11/sbin/iscontrol/Makefile stable/11/sbin/ldconfig/Makefile stable/11/sbin/mksnap_ffs/Makefile stable/11/sbin/mount_cd9660/Makefile stable/11/sbin/mount_fusefs/Makefile stable/11/sbin/mount_msdosfs/Makefile stable/11/sbin/mount_nfs/Makefile stable/11/sbin/mount_nullfs/Makefile stable/11/sbin/mount_udf/Makefile stable/11/sbin/mount_unionfs/Makefile stable/11/sbin/newfs/Makefile stable/11/sbin/nvmecontrol/Makefile stable/11/sbin/pfctl/Makefile stable/11/sbin/pflogd/Makefile stable/11/sbin/quotacheck/Makefile stable/11/sbin/resolvconf/Makefile stable/11/sbin/restore/Makefile stable/11/sbin/rtsol/Makefile stable/11/sbin/setkey/Makefile stable/11/sbin/sunlabel/Makefile stable/11/sbin/umount/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/sbin/atm/atmconfig/Makefile ============================================================================== --- stable/11/sbin/atm/atmconfig/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/atm/atmconfig/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/bsdlabel/Makefile ============================================================================== --- stable/11/sbin/bsdlabel/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/bsdlabel/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/dhclient/tests/Makefile ============================================================================== --- stable/11/sbin/dhclient/tests/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/dhclient/tests/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/etherswitchcfg/Makefile ============================================================================== --- stable/11/sbin/etherswitchcfg/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/etherswitchcfg/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/fdisk/Makefile ============================================================================== --- stable/11/sbin/fdisk/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/fdisk/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ffsinfo/Makefile ============================================================================== --- stable/11/sbin/ffsinfo/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ffsinfo/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -4,7 +4,7 @@ # $FreeBSD$ # -GROWFS= ${.CURDIR}/../growfs +GROWFS= ${.CURDIR:H}/growfs .PATH: ${GROWFS} PACKAGE=runtime Modified: stable/11/sbin/fsck_ffs/Makefile ============================================================================== --- stable/11/sbin/fsck_ffs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/fsck_ffs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -12,8 +12,8 @@ SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1 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: stable/11/sbin/fsck_msdosfs/Makefile ============================================================================== --- stable/11/sbin/fsck_msdosfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/fsck_msdosfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/fsdb/Makefile ============================================================================== --- stable/11/sbin/fsdb/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/fsdb/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/gbde/Makefile ============================================================================== --- stable/11/sbin/gbde/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/gbde/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/class/Makefile.inc ============================================================================== --- stable/11/sbin/geom/class/Makefile.inc Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/Makefile.inc Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/class/cache/Makefile ============================================================================== --- stable/11/sbin/geom/class/cache/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/cache/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache Modified: stable/11/sbin/geom/class/concat/Makefile ============================================================================== --- stable/11/sbin/geom/class/concat/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/concat/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat Modified: stable/11/sbin/geom/class/eli/Makefile ============================================================================== --- stable/11/sbin/geom/class/eli/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/eli/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/class/journal/Makefile ============================================================================== --- stable/11/sbin/geom/class/journal/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/journal/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/class/label/Makefile ============================================================================== --- stable/11/sbin/geom/class/label/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/label/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label Modified: stable/11/sbin/geom/class/mirror/Makefile ============================================================================== --- stable/11/sbin/geom/class/mirror/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/mirror/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror Modified: stable/11/sbin/geom/class/mountver/Makefile ============================================================================== --- stable/11/sbin/geom/class/mountver/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/mountver/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver Modified: stable/11/sbin/geom/class/multipath/Makefile ============================================================================== --- stable/11/sbin/geom/class/multipath/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/multipath/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/class/nop/Makefile ============================================================================== --- stable/11/sbin/geom/class/nop/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/nop/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop Modified: stable/11/sbin/geom/class/part/Makefile ============================================================================== --- stable/11/sbin/geom/class/part/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/part/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part Modified: stable/11/sbin/geom/class/raid/Makefile ============================================================================== --- stable/11/sbin/geom/class/raid/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/raid/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid Modified: stable/11/sbin/geom/class/raid3/Makefile ============================================================================== --- stable/11/sbin/geom/class/raid3/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/raid3/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 Modified: stable/11/sbin/geom/class/sched/Makefile ============================================================================== --- stable/11/sbin/geom/class/sched/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/sched/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -2,7 +2,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= sched Modified: stable/11/sbin/geom/class/shsec/Makefile ============================================================================== --- stable/11/sbin/geom/class/shsec/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/shsec/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec Modified: stable/11/sbin/geom/class/stripe/Makefile ============================================================================== --- stable/11/sbin/geom/class/stripe/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/stripe/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe Modified: stable/11/sbin/geom/class/virstor/Makefile ============================================================================== --- stable/11/sbin/geom/class/virstor/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/class/virstor/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/geom/core/Makefile ============================================================================== --- stable/11/sbin/geom/core/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/geom/core/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ggate/ggatec/Makefile ============================================================================== --- stable/11/sbin/ggate/ggatec/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ggate/ggatec/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ggate/ggated/Makefile ============================================================================== --- stable/11/sbin/ggate/ggated/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ggate/ggated/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ggate/ggatel/Makefile ============================================================================== --- stable/11/sbin/ggate/ggatel/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ggate/ggatel/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/growfs/Makefile ============================================================================== --- stable/11/sbin/growfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/growfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/gvinum/Makefile ============================================================================== --- stable/11/sbin/gvinum/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/gvinum/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -6,10 +6,10 @@ SRCS= gvinum.c gvinum.h geom_vinum_share.c 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: stable/11/sbin/hastctl/Makefile ============================================================================== --- stable/11/sbin/hastctl/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/hastctl/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/init/Makefile ============================================================================== --- stable/11/sbin/init/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/init/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -11,7 +11,7 @@ CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYS LIBADD= util crypt # Needed for getmntopts.c -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} Modified: stable/11/sbin/ipf/Makefile.inc ============================================================================== --- stable/11/sbin/ipf/Makefile.inc Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ipf/Makefile.inc Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ipf/ipf/Makefile ============================================================================== --- stable/11/sbin/ipf/ipf/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ipf/ipf/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ipf/ipftest/Makefile ============================================================================== --- stable/11/sbin/ipf/ipftest/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ipf/ipftest/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -20,11 +20,11 @@ CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER # 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: stable/11/sbin/ipf/ipresend/Makefile ============================================================================== --- stable/11/sbin/ipf/ipresend/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ipf/ipresend/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/iscontrol/Makefile ============================================================================== --- stable/11/sbin/iscontrol/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/iscontrol/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/ldconfig/Makefile ============================================================================== --- stable/11/sbin/ldconfig/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/ldconfig/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mksnap_ffs/Makefile ============================================================================== --- stable/11/sbin/mksnap_ffs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mksnap_ffs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_cd9660/Makefile ============================================================================== --- stable/11/sbin/mount_cd9660/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_cd9660/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_fusefs/Makefile ============================================================================== --- stable/11/sbin/mount_fusefs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_fusefs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_msdosfs/Makefile ============================================================================== --- stable/11/sbin/mount_msdosfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_msdosfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_nfs/Makefile ============================================================================== --- stable/11/sbin/mount_nfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_nfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_nullfs/Makefile ============================================================================== --- stable/11/sbin/mount_nullfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_nullfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_udf/Makefile ============================================================================== --- stable/11/sbin/mount_udf/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_udf/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/mount_unionfs/Makefile ============================================================================== --- stable/11/sbin/mount_unionfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/mount_unionfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/newfs/Makefile ============================================================================== --- stable/11/sbin/newfs/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/newfs/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/nvmecontrol/Makefile ============================================================================== --- stable/11/sbin/nvmecontrol/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/nvmecontrol/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -6,6 +6,6 @@ SRCS= nvmecontrol.c devlist.c firmware.c identify.c lo perftest.c reset.c nvme_util.c power.c MAN= nvmecontrol.8 -.PATH: ${.CURDIR}/../../sys/dev/nvme +.PATH: ${SRCTOP}/sys/dev/nvme .include <bsd.prog.mk> Modified: stable/11/sbin/pfctl/Makefile ============================================================================== --- stable/11/sbin/pfctl/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/pfctl/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/pflogd/Makefile ============================================================================== --- stable/11/sbin/pflogd/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/pflogd/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,13 +1,13 @@ # $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+=-include ${SRCTOP}/lib/libpcap/config.h LIBADD= pcap Modified: stable/11/sbin/quotacheck/Makefile ============================================================================== --- stable/11/sbin/quotacheck/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/quotacheck/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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: stable/11/sbin/resolvconf/Makefile ============================================================================== --- stable/11/sbin/resolvconf/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/resolvconf/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # $FreeBSD$ PACKAGE=runtime -DIST= ${.CURDIR}/../../contrib/openresolv +DIST= ${SRCTOP}/contrib/openresolv .PATH: ${DIST} SCRIPTS= resolvconf Modified: stable/11/sbin/restore/Makefile ============================================================================== --- stable/11/sbin/restore/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/restore/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../dump +.PATH: ${.CURDIR:H}/dump PACKAGE=runtime PROG= restore Modified: stable/11/sbin/rtsol/Makefile ============================================================================== --- stable/11/sbin/rtsol/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/rtsol/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -14,7 +14,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.sbin/rtsold +.PATH: ${SRCTOP}/usr.sbin/rtsold PACKAGE=runtime PROG= rtsol Modified: stable/11/sbin/setkey/Makefile ============================================================================== --- stable/11/sbin/setkey/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/setkey/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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 keytest # 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: stable/11/sbin/sunlabel/Makefile ============================================================================== --- stable/11/sbin/sunlabel/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/sunlabel/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PROG= sunlabel SRCS= sunlabel.c geom_sunlabel_enc.c Modified: stable/11/sbin/umount/Makefile ============================================================================== --- stable/11/sbin/umount/Makefile Tue May 30 04:15:40 2017 (r319184) +++ stable/11/sbin/umount/Makefile Tue May 30 04:17:22 2017 (r319185) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705300417.v4U4HMQF082473>