From owner-svn-src-stable-11@freebsd.org Mon May 29 10:15:49 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77603CFAAF3; Mon, 29 May 2017 10:15:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31B7773C74; Mon, 29 May 2017 10:15:49 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4TAFmEe026478; Mon, 29 May 2017 10:15:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TAFfc0026411; Mon, 29 May 2017 10:15:41 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201705291015.v4TAFfc0026411@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 29 May 2017 10:15:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r319119 - in stable/11/usr.sbin: acpi amd amd/amd amd/libamu ancontrol audit auditd auditdistd auditreduce authpf autofs bhyvectl bhyveload bluetooth bluetooth/bthidcontrol bluetooth/rf... X-SVN-Group: stable-11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 May 2017 10:15:49 -0000 Author: ngie Date: Mon May 29 10:15:41 2017 New Revision: 319119 URL: https://svnweb.freebsd.org/changeset/base/319119 Log: MFC r314659,r314676: r314659: usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible This simplifies make logic/output r314676: Fix build after r314656 Some of the changes I introduced to use .ALLSRC were correct in spirit, but incorrect in reality -- in particular, ../Makefile.inc hadn't been pulled in via bsd.init.mk (via bsd.lib.mk, bsd.prog.mk), so the value of .ALLSRC (evaluated immediately) was empty. .include bsd.init.mk explicitly so we can be certain that the values used as dependencies in the targets are defined when the target recipe has been evaluated. Reminder: thou shalt separate out separate functional changes before committing them. (YUGE) Pointyhat to: ngie In collaboration with: bdrewery Modified: stable/11/usr.sbin/acpi/Makefile.inc stable/11/usr.sbin/amd/Makefile.inc stable/11/usr.sbin/amd/amd/Makefile stable/11/usr.sbin/amd/libamu/Makefile stable/11/usr.sbin/ancontrol/Makefile stable/11/usr.sbin/audit/Makefile stable/11/usr.sbin/auditd/Makefile stable/11/usr.sbin/auditdistd/Makefile stable/11/usr.sbin/auditreduce/Makefile stable/11/usr.sbin/authpf/Makefile stable/11/usr.sbin/autofs/Makefile stable/11/usr.sbin/bhyvectl/Makefile stable/11/usr.sbin/bhyveload/Makefile stable/11/usr.sbin/bluetooth/Makefile.inc stable/11/usr.sbin/bluetooth/bthidcontrol/Makefile stable/11/usr.sbin/bluetooth/rfcomm_pppd/Makefile stable/11/usr.sbin/bsnmpd/bsnmpd/Makefile stable/11/usr.sbin/bsnmpd/gensnmptree/Makefile stable/11/usr.sbin/bsnmpd/tools/Makefile.inc stable/11/usr.sbin/camdd/Makefile stable/11/usr.sbin/ckdist/Makefile stable/11/usr.sbin/cron/crontab/Makefile stable/11/usr.sbin/cron/lib/Makefile stable/11/usr.sbin/ctladm/Makefile stable/11/usr.sbin/ctld/Makefile stable/11/usr.sbin/ctm/Makefile.inc stable/11/usr.sbin/ctm/ctm/Makefile stable/11/usr.sbin/ctm/ctm_dequeue/Makefile stable/11/usr.sbin/ctm/ctm_smail/Makefile stable/11/usr.sbin/dconschat/Makefile stable/11/usr.sbin/editmap/Makefile stable/11/usr.sbin/eeprom/Makefile stable/11/usr.sbin/fdcontrol/Makefile stable/11/usr.sbin/fdformat/Makefile stable/11/usr.sbin/fmtree/Makefile stable/11/usr.sbin/fstyp/Makefile stable/11/usr.sbin/ftp-proxy/Makefile stable/11/usr.sbin/fwcontrol/Makefile stable/11/usr.sbin/gpioctl/Makefile stable/11/usr.sbin/gssd/Makefile stable/11/usr.sbin/hyperv/tools/kvp/Makefile stable/11/usr.sbin/hyperv/tools/vss/Makefile stable/11/usr.sbin/iovctl/Makefile stable/11/usr.sbin/iscsid/Makefile stable/11/usr.sbin/mailstats/Makefile stable/11/usr.sbin/mailwrapper/Makefile stable/11/usr.sbin/makemap/Makefile stable/11/usr.sbin/mlxcontrol/Makefile stable/11/usr.sbin/mount_smbfs/Makefile stable/11/usr.sbin/mountd/Makefile stable/11/usr.sbin/mpsutil/Makefile stable/11/usr.sbin/ndiscvt/Makefile stable/11/usr.sbin/ndp/Makefile stable/11/usr.sbin/nmtree/Makefile stable/11/usr.sbin/pkg/Makefile stable/11/usr.sbin/pnpinfo/Makefile stable/11/usr.sbin/praliases/Makefile stable/11/usr.sbin/praudit/Makefile stable/11/usr.sbin/pwd_mkdb/Makefile stable/11/usr.sbin/rip6query/Makefile stable/11/usr.sbin/rpcbind/tests/Makefile stable/11/usr.sbin/rtadvctl/Makefile stable/11/usr.sbin/sa/Makefile stable/11/usr.sbin/sendmail/Makefile stable/11/usr.sbin/tcpdump/tcpdump/Makefile stable/11/usr.sbin/timed/timedc/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/acpi/Makefile.inc ============================================================================== --- stable/11/usr.sbin/acpi/Makefile.inc Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/acpi/Makefile.inc Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/amd/Makefile.inc ============================================================================== --- stable/11/usr.sbin/amd/Makefile.inc Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/amd/Makefile.inc Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/amd/amd/Makefile ============================================================================== --- stable/11/usr.sbin/amd/amd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/amd/amd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -6,7 +6,7 @@ # $FreeBSD$ # -.include +.include .PATH: ${.CURDIR}/../../../contrib/amd/amd @@ -28,7 +28,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c sun_m CFLAGS+= -I${.CURDIR}/../../../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: stable/11/usr.sbin/amd/libamu/Makefile ============================================================================== --- stable/11/usr.sbin/amd/libamu/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/amd/libamu/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -5,10 +5,12 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/libamu \ - ${.CURDIR}/../../../contrib/amd/conf/transp \ - ${.CURDIR}/../../../contrib/amd/conf/mtab \ - ${.CURDIR}/../../../contrib/amd/conf/umount +.include + +.PATH: ${SRCTOP}/contrib/amd/libamu \ + ${SRCTOP}/contrib/amd/conf/transp \ + ${SRCTOP}/contrib/amd/conf/mtab \ + ${SRCTOP}/contrib/amd/conf/umount LIB= amu INTERNALLIB= @@ -23,10 +25,10 @@ SRCS+= nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c CFLAGS+= -I${.CURDIR}/../../../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' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' Modified: stable/11/usr.sbin/ancontrol/Makefile ============================================================================== --- stable/11/usr.sbin/ancontrol/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ancontrol/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -4,7 +4,7 @@ PROG= ancontrol MAN= ancontrol.8 WARNS?= 3 -CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys +CFLAGS+= -DANCACHE -I${SRCTOP}/sys LIBADD= md Modified: stable/11/usr.sbin/audit/Makefile ============================================================================== --- stable/11/usr.sbin/audit/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/audit/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/audit CFLAGS+= -I${OPENBSMDIR} Modified: stable/11/usr.sbin/auditd/Makefile ============================================================================== --- stable/11/usr.sbin/auditd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/auditd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditd CFLAGS+= -I${OPENBSMDIR} Modified: stable/11/usr.sbin/auditdistd/Makefile ============================================================================== --- stable/11/usr.sbin/auditdistd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/auditdistd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/auditreduce/Makefile ============================================================================== --- stable/11/usr.sbin/auditreduce/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/auditreduce/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/auditreduce CFLAGS+= -I${OPENBSMDIR} Modified: stable/11/usr.sbin/authpf/Makefile ============================================================================== --- stable/11/usr.sbin/authpf/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/authpf/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/pf/authpf +.PATH: ${SRCTOP}/contrib/pf/authpf PROG= authpf MAN= authpf.8 Modified: stable/11/usr.sbin/autofs/Makefile ============================================================================== --- stable/11/usr.sbin/autofs/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/autofs/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/bhyvectl/Makefile ============================================================================== --- stable/11/usr.sbin/bhyvectl/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bhyvectl/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -12,6 +12,6 @@ LIBADD= vmmapi util WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../../sys/amd64/vmm +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm .include Modified: stable/11/usr.sbin/bhyveload/Makefile ============================================================================== --- stable/11/usr.sbin/bhyveload/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bhyveload/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -9,6 +9,6 @@ LIBADD= vmmapi WARNS?= 3 -CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot +CFLAGS+=-I${SRCTOP}/sys/boot/userboot .include Modified: stable/11/usr.sbin/bluetooth/Makefile.inc ============================================================================== --- stable/11/usr.sbin/bluetooth/Makefile.inc Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bluetooth/Makefile.inc Mon May 29 10:15:41 2017 (r319119) @@ -1,4 +1,3 @@ # $FreeBSD$ -.include "${.CURDIR}/../../Makefile.inc" - +.include "${.CURDIR:H:H}/Makefile.inc" Modified: stable/11/usr.sbin/bluetooth/bthidcontrol/Makefile ============================================================================== --- stable/11/usr.sbin/bluetooth/bthidcontrol/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bluetooth/bthidcontrol/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/bluetooth/rfcomm_pppd/Makefile ============================================================================== --- stable/11/usr.sbin/bluetooth/rfcomm_pppd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bluetooth/rfcomm_pppd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/bsnmpd/bsnmpd/Makefile ============================================================================== --- stable/11/usr.sbin/bsnmpd/bsnmpd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bsnmpd/bsnmpd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -4,7 +4,7 @@ .include -CONTRIB=${.CURDIR}/../../../contrib/bsnmp +CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/snmpd PROG= bsnmpd Modified: stable/11/usr.sbin/bsnmpd/gensnmptree/Makefile ============================================================================== --- stable/11/usr.sbin/bsnmpd/gensnmptree/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bsnmpd/gensnmptree/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ # # Author: Harti Brandt -CONTRIB=${.CURDIR}/../../../contrib/bsnmp +CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/gensnmptree PROG= gensnmptree Modified: stable/11/usr.sbin/bsnmpd/tools/Makefile.inc ============================================================================== --- stable/11/usr.sbin/bsnmpd/tools/Makefile.inc Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/bsnmpd/tools/Makefile.inc Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/camdd/Makefile ============================================================================== --- stable/11/usr.sbin/camdd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/camdd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ckdist/Makefile ============================================================================== --- stable/11/usr.sbin/ckdist/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ckdist/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.bin/cksum +.PATH: ${SRCTOP}/usr.bin/cksum PROG= ckdist SRCS= ckdist.c crc.c Modified: stable/11/usr.sbin/cron/crontab/Makefile ============================================================================== --- stable/11/usr.sbin/cron/crontab/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/cron/crontab/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -10,7 +10,7 @@ PRECIOUSPROG= WARNS?= 3 -CFLAGS+= -I${.CURDIR}/../cron +CFLAGS+= -I${.CURDIR:H}/cron LIBADD= cron md util Modified: stable/11/usr.sbin/cron/lib/Makefile ============================================================================== --- stable/11/usr.sbin/cron/lib/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/cron/lib/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/ctladm/Makefile ============================================================================== --- stable/11/usr.sbin/ctladm/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctladm/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ctld/Makefile ============================================================================== --- stable/11/usr.sbin/ctld/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctld/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ctm/Makefile.inc ============================================================================== --- stable/11/usr.sbin/ctm/Makefile.inc Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctm/Makefile.inc Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ctm/ctm/Makefile ============================================================================== --- stable/11/usr.sbin/ctm/ctm/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctm/ctm/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/ctm/ctm_dequeue/Makefile ============================================================================== --- stable/11/usr.sbin/ctm/ctm_dequeue/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctm/ctm_dequeue/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ctm/ctm_smail/Makefile ============================================================================== --- stable/11/usr.sbin/ctm/ctm_smail/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ctm/ctm_smail/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/dconschat/Makefile ============================================================================== --- stable/11/usr.sbin/dconschat/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/dconschat/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -3,7 +3,7 @@ PROG= dconschat MAN= dconschat.8 -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys LIBADD= kvm Modified: stable/11/usr.sbin/editmap/Makefile ============================================================================== --- stable/11/usr.sbin/editmap/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/editmap/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -1,6 +1,6 @@ # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap PROG= editmap Modified: stable/11/usr.sbin/eeprom/Makefile ============================================================================== --- stable/11/usr.sbin/eeprom/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/eeprom/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/fdcontrol/Makefile ============================================================================== --- stable/11/usr.sbin/fdcontrol/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/fdcontrol/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 .if ${MACHINE} == "pc98" Modified: stable/11/usr.sbin/fdformat/Makefile ============================================================================== --- stable/11/usr.sbin/fdformat/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/fdformat/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../fdread +.PATH: ${.CURDIR:H}/fdread PROG= fdformat SRCS= fdformat.c fdutil.c -CFLAGS+= -I${.CURDIR}/../fdread +CFLAGS+= -I${.CURDIR:H}/fdread .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 Modified: stable/11/usr.sbin/fmtree/Makefile ============================================================================== --- stable/11/usr.sbin/fmtree/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/fmtree/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -3,7 +3,7 @@ .include -.PATH: ${.CURDIR}/../../usr.bin/cksum +.PATH: ${SRCTOP}/usr.bin/cksum PROG= fmtree MAN= fmtree.8 Modified: stable/11/usr.sbin/fstyp/Makefile ============================================================================== --- stable/11/usr.sbin/fstyp/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/fstyp/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -18,7 +18,7 @@ WARNS?= 2 SUBDIR+= tests .endif -CFLAGS+=-I${.CURDIR}/../../sys +CFLAGS+=-I${SRCTOP}/sys .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES Modified: stable/11/usr.sbin/ftp-proxy/Makefile ============================================================================== --- stable/11/usr.sbin/ftp-proxy/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ftp-proxy/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/fwcontrol/Makefile ============================================================================== --- stable/11/usr.sbin/fwcontrol/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/fwcontrol/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/gpioctl/Makefile ============================================================================== --- stable/11/usr.sbin/gpioctl/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/gpioctl/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -3,7 +3,7 @@ PROG= gpioctl MAN= gpioctl.8 -CFLAGS+= -I${.CURDIR}/../../lib/libgpio +CFLAGS+= -I${SRCTOP}/lib/libgpio LIBADD= gpio Modified: stable/11/usr.sbin/gssd/Makefile ============================================================================== --- stable/11/usr.sbin/gssd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/gssd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/hyperv/tools/kvp/Makefile ============================================================================== --- stable/11/usr.sbin/hyperv/tools/kvp/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/hyperv/tools/kvp/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,12 +2,12 @@ .include -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 Modified: stable/11/usr.sbin/hyperv/tools/vss/Makefile ============================================================================== --- stable/11/usr.sbin/hyperv/tools/vss/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/hyperv/tools/vss/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -3,12 +3,12 @@ DIRDEPS = lib/libc .include -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 Modified: stable/11/usr.sbin/iovctl/Makefile ============================================================================== --- stable/11/usr.sbin/iovctl/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/iovctl/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/iscsid/Makefile ============================================================================== --- stable/11/usr.sbin/iscsid/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/iscsid/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mailstats/Makefile ============================================================================== --- stable/11/usr.sbin/mailstats/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mailstats/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mailwrapper/Makefile ============================================================================== --- stable/11/usr.sbin/mailwrapper/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mailwrapper/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -27,7 +27,7 @@ SYMLINKS+= ..${BINDIR}/mailwrapper /bin/ .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: stable/11/usr.sbin/makemap/Makefile ============================================================================== --- stable/11/usr.sbin/makemap/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/makemap/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mlxcontrol/Makefile ============================================================================== --- stable/11/usr.sbin/mlxcontrol/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mlxcontrol/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mount_smbfs/Makefile ============================================================================== --- stable/11/usr.sbin/mount_smbfs/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mount_smbfs/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mountd/Makefile ============================================================================== --- stable/11/usr.sbin/mountd/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mountd/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/mpsutil/Makefile ============================================================================== --- stable/11/usr.sbin/mpsutil/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/mpsutil/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ndiscvt/Makefile ============================================================================== --- stable/11/usr.sbin/ndiscvt/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ndiscvt/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/ndp/Makefile ============================================================================== --- stable/11/usr.sbin/ndp/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/ndp/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/nmtree/Makefile ============================================================================== --- stable/11/usr.sbin/nmtree/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/nmtree/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,18 +2,18 @@ .include -.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: stable/11/usr.sbin/pkg/Makefile ============================================================================== --- stable/11/usr.sbin/pkg/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/pkg/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/pnpinfo/Makefile ============================================================================== --- stable/11/usr.sbin/pnpinfo/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/pnpinfo/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 Modified: stable/11/usr.sbin/praliases/Makefile ============================================================================== --- stable/11/usr.sbin/praliases/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/praliases/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/praudit/Makefile ============================================================================== --- stable/11/usr.sbin/praudit/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/praudit/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ # $FreeBSD$ # -OPENBSMDIR=${.CURDIR}/../../contrib/openbsm +OPENBSMDIR=${SRCTOP}/contrib/openbsm .PATH: ${OPENBSMDIR}/bin/praudit PROG= praudit Modified: stable/11/usr.sbin/pwd_mkdb/Makefile ============================================================================== --- stable/11/usr.sbin/pwd_mkdb/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/pwd_mkdb/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/rip6query/Makefile ============================================================================== --- stable/11/usr.sbin/rip6query/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/rip6query/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -4,6 +4,6 @@ PROG= rip6query MAN= rip6query.8 -CFLAGS+= -I${.CURDIR}/../route6d +CFLAGS+= -I${.CURDIR:H}/route6d .include Modified: stable/11/usr.sbin/rpcbind/tests/Makefile ============================================================================== --- stable/11/usr.sbin/rpcbind/tests/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/rpcbind/tests/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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: stable/11/usr.sbin/rtadvctl/Makefile ============================================================================== --- stable/11/usr.sbin/rtadvctl/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/rtadvctl/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -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 Modified: stable/11/usr.sbin/sa/Makefile ============================================================================== --- stable/11/usr.sbin/sa/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/sa/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../usr.bin/lastcomm +.PATH: ${SRCTOP}/usr.bin/lastcomm PROG= sa MAN= sa.8 Modified: stable/11/usr.sbin/sendmail/Makefile ============================================================================== --- stable/11/usr.sbin/sendmail/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/sendmail/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -4,14 +4,14 @@ .include 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: stable/11/usr.sbin/tcpdump/tcpdump/Makefile ============================================================================== --- stable/11/usr.sbin/tcpdump/tcpdump/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/tcpdump/tcpdump/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -2,7 +2,7 @@ .include -TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump +TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump .PATH: ${TCPDUMP_DISTDIR} PROG= tcpdump Modified: stable/11/usr.sbin/timed/timedc/Makefile ============================================================================== --- stable/11/usr.sbin/timed/timedc/Makefile Mon May 29 09:30:38 2017 (r319118) +++ stable/11/usr.sbin/timed/timedc/Makefile Mon May 29 10:15:41 2017 (r319119) @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../timed +.PATH: ${.CURDIR:H}/timed PROG= timedc MAN= timedc.8