Index: head/sbin/atm/atmconfig/Makefile =================================================================== --- head/sbin/atm/atmconfig/Makefile (revision 314655) +++ head/sbin/atm/atmconfig/Makefile (revision 314656) @@ -1,44 +1,44 @@ # Copyright (c) 2001-2003 # Fraunhofer Institute for Open Communication Systems (FhG Fokus). # All rights reserved. # Author: Harti Brandt # # $FreeBSD$ .include PACKAGE=atm PROG= atmconfig SRCS= main.c diag.c natm.c MAN= atmconfig.8 # CFLAGS+= -DPATH_HELP='".:${SHAREDIR}/doc/atm:/usr/local/share/doc/atm"' CFLAGS+= -I${.OBJDIR} .if !defined(RESCUE) && ${MK_BSNMP} != "no" CFLAGS+= -DWITH_BSNMP SRCS+= oid.h atmconfig_device.c LIBADD+= bsnmp . if ${MK_DYNAMICROOT} == "no" && ${MK_OPENSSL} != "no" LIBADD+= crypto . endif .endif CLEANFILES+= oid.h # XXX - this is verboten .if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif 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` \ > ${.TARGET} .include Index: head/sbin/bsdlabel/Makefile =================================================================== --- head/sbin/bsdlabel/Makefile (revision 314655) +++ head/sbin/bsdlabel/Makefile (revision 314656) @@ -1,18 +1,18 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PACKAGE=runtime PROG= bsdlabel SRCS= bsdlabel.c geom_bsd_enc.c MAN+= bsdlabel.8 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel MLINKS= bsdlabel.8 disklabel.8 .endif LIBADD= geom .include Index: head/sbin/decryptcore/Makefile =================================================================== --- head/sbin/decryptcore/Makefile (revision 314655) +++ head/sbin/decryptcore/Makefile (revision 314656) @@ -1,13 +1,13 @@ # $FreeBSD$ PROG= decryptcore LIBADD= crypto pjdlog MAN= decryptcore.8 -CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog +CFLAGS+=-I${SRCTOP}/lib/libpjdlog WARNS?= 6 .include Index: head/sbin/dhclient/tests/Makefile =================================================================== --- head/sbin/dhclient/tests/Makefile (revision 314655) +++ head/sbin/dhclient/tests/Makefile (revision 314656) @@ -1,13 +1,13 @@ # $FreeBSD$ .PATH: ${.CURDIR:H} 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 .include Index: head/sbin/etherswitchcfg/Makefile =================================================================== --- head/sbin/etherswitchcfg/Makefile (revision 314655) +++ head/sbin/etherswitchcfg/Makefile (revision 314656) @@ -1,10 +1,10 @@ # @(#)Makefile 5.4 (Berkeley) 6/5/91 # $FreeBSD$ PACKAGE=runtime PROG= etherswitchcfg MAN= etherswitchcfg.8 SRCS= etherswitchcfg.c ifmedia.c -CFLAGS+= -I${.CURDIR}/../../sys +CFLAGS+= -I${SRCTOP}/sys .include Index: head/sbin/fdisk/Makefile =================================================================== --- head/sbin/fdisk/Makefile (revision 314655) +++ head/sbin/fdisk/Makefile (revision 314656) @@ -1,16 +1,16 @@ # $FreeBSD$ PACKAGE=runtime PROG= fdisk SRCS= fdisk.c geom_mbr_enc.c WARNS?= 4 MAN= fdisk.8 -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom LIBADD= geom .include test: ${PROG} sh ${.CURDIR}/runtest.sh Index: head/sbin/ffsinfo/Makefile =================================================================== --- head/sbin/ffsinfo/Makefile (revision 314655) +++ head/sbin/ffsinfo/Makefile (revision 314656) @@ -1,19 +1,19 @@ # @(#)Makefile 8.8 (Berkeley) 6/21/2000 # # $TSHeader: src/sbin/ffsinfo/Makefile,v 1.3 2000/12/05 19:45:10 tomsoft Exp $ # $FreeBSD$ # -GROWFS= ${.CURDIR}/../growfs +GROWFS= ${.CURDIR:H}/growfs .PATH: ${GROWFS} PACKAGE=runtime PROG= ffsinfo SRCS= ffsinfo.c debug.c MAN= ffsinfo.8 WARNS?= 1 CFLAGS+=-DFS_DEBUG -I${GROWFS} LIBADD= ufs .include Index: head/sbin/fsck_ffs/Makefile =================================================================== --- head/sbin/fsck_ffs/Makefile (revision 314655) +++ head/sbin/fsck_ffs/Makefile (revision 314656) @@ -1,19 +1,19 @@ # $FreeBSD$ # @(#)Makefile 8.2 (Berkeley) 4/27/95 PACKAGE=runtime PROG= fsck_ffs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd MAN= fsck_ffs.8 MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8 fsck_4.2bsd.8 SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.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 Index: head/sbin/fsck_msdosfs/Makefile =================================================================== --- head/sbin/fsck_msdosfs/Makefile (revision 314655) +++ head/sbin/fsck_msdosfs/Makefile (revision 314656) @@ -1,14 +1,14 @@ # $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 PROG= fsck_msdosfs MAN= fsck_msdosfs.8 SRCS= main.c check.c boot.c fat.c dir.c fsutil.c CFLAGS+= -I${FSCK} .include Index: head/sbin/fsdb/Makefile =================================================================== --- head/sbin/fsdb/Makefile (revision 314655) +++ head/sbin/fsdb/Makefile (revision 314656) @@ -1,16 +1,16 @@ # $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ PACKAGE=runtime PROG= fsdb 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 Index: head/sbin/gbde/Makefile =================================================================== --- head/sbin/gbde/Makefile (revision 314655) +++ head/sbin/gbde/Makefile (revision 314656) @@ -1,33 +1,33 @@ # $FreeBSD$ PACKAGE=runtime PROG= gbde SRCS= gbde.c template.c SRCS+= rijndael-alg-fst.c SRCS+= rijndael-api-fst.c SRCS+= sha512c.c SRCS+= g_bde_lock.c # rijndael-fst.c does evil casting things which can results in warnings, # the test-vectors check out however, so it works right. 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 MAN= gbde.8 LIBADD= md util geom template.c: template.txt file2c 'const char template[] = {' ',0};' \ < ${.CURDIR}/template.txt > template.c test: ${PROG} sh ${.CURDIR}/test.sh ${.CURDIR} .include Index: head/sbin/geom/class/Makefile.inc =================================================================== --- head/sbin/geom/class/Makefile.inc (revision 314655) +++ head/sbin/geom/class/Makefile.inc (revision 314656) @@ -1,13 +1,13 @@ # $FreeBSD$ SHLIBDIR?=${GEOM_CLASS_DIR} SHLIB_NAME?=geom_${GEOM_CLASS}.so LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS} MAN= g${GEOM_CLASS}.8 SRCS+= geom_${GEOM_CLASS}.c subr.c NO_WMISSING_VARIABLE_DECLARATIONS= -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${.CURDIR:H:H} .include "../Makefile.inc" Index: head/sbin/geom/class/cache/Makefile =================================================================== --- head/sbin/geom/class/cache/Makefile (revision 314655) +++ head/sbin/geom/class/cache/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= cache .include Index: head/sbin/geom/class/concat/Makefile =================================================================== --- head/sbin/geom/class/concat/Makefile (revision 314655) +++ head/sbin/geom/class/concat/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= concat .include Index: head/sbin/geom/class/eli/Makefile =================================================================== --- head/sbin/geom/class/eli/Makefile (revision 314655) +++ head/sbin/geom/class/eli/Makefile (revision 314656) @@ -1,20 +1,20 @@ # $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 SRCS+= g_eli_hmac.c SRCS+= g_eli_key.c SRCS+= pkcs5v2.c SRCS+= sha256c.c SRCS+= sha512c.c LIBADD= md crypto WARNS?= 3 -CFLAGS+=-I${.CURDIR}/../../../../sys +CFLAGS+=-I${SRCTOP}/sys .include Index: head/sbin/geom/class/journal/Makefile =================================================================== --- head/sbin/geom/class/journal/Makefile (revision 314655) +++ head/sbin/geom/class/journal/Makefile (revision 314656) @@ -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 Index: head/sbin/geom/class/label/Makefile =================================================================== --- head/sbin/geom/class/label/Makefile (revision 314655) +++ head/sbin/geom/class/label/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= label .include Index: head/sbin/geom/class/mirror/Makefile =================================================================== --- head/sbin/geom/class/mirror/Makefile (revision 314655) +++ head/sbin/geom/class/mirror/Makefile (revision 314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mirror LIBADD= md .include Index: head/sbin/geom/class/mountver/Makefile =================================================================== --- head/sbin/geom/class/mountver/Makefile (revision 314655) +++ head/sbin/geom/class/mountver/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= mountver .include Index: head/sbin/geom/class/multipath/Makefile =================================================================== --- head/sbin/geom/class/multipath/Makefile (revision 314655) +++ head/sbin/geom/class/multipath/Makefile (revision 314656) @@ -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 Index: head/sbin/geom/class/nop/Makefile =================================================================== --- head/sbin/geom/class/nop/Makefile (revision 314655) +++ head/sbin/geom/class/nop/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= nop .include Index: head/sbin/geom/class/part/Makefile =================================================================== --- head/sbin/geom/class/part/Makefile (revision 314655) +++ head/sbin/geom/class/part/Makefile (revision 314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= part LIBADD= util .include Index: head/sbin/geom/class/raid/Makefile =================================================================== --- head/sbin/geom/class/raid/Makefile (revision 314655) +++ head/sbin/geom/class/raid/Makefile (revision 314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid LIBADD= md .include Index: head/sbin/geom/class/raid3/Makefile =================================================================== --- head/sbin/geom/class/raid3/Makefile (revision 314655) +++ head/sbin/geom/class/raid3/Makefile (revision 314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= raid3 LIBADD= md .include Index: head/sbin/geom/class/sched/Makefile =================================================================== --- head/sbin/geom/class/sched/Makefile (revision 314655) +++ head/sbin/geom/class/sched/Makefile (revision 314656) @@ -1,9 +1,9 @@ # GEOM_LIBRARY_PATH # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= sched .include Index: head/sbin/geom/class/shsec/Makefile =================================================================== --- head/sbin/geom/class/shsec/Makefile (revision 314655) +++ head/sbin/geom/class/shsec/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= shsec .include Index: head/sbin/geom/class/stripe/Makefile =================================================================== --- head/sbin/geom/class/stripe/Makefile (revision 314655) +++ head/sbin/geom/class/stripe/Makefile (revision 314656) @@ -1,8 +1,8 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR:H:H}/misc GEOM_CLASS= stripe .include Index: head/sbin/geom/class/virstor/Makefile =================================================================== --- head/sbin/geom/class/virstor/Makefile (revision 314655) +++ head/sbin/geom/class/virstor/Makefile (revision 314656) @@ -1,11 +1,11 @@ # $FreeBSD$ PACKAGE=runtime -.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor +.PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor GEOM_CLASS= virstor SRCS+= binstream.c SRCS+= g_virstor_md.c .include Index: head/sbin/geom/core/Makefile =================================================================== --- head/sbin/geom/core/Makefile (revision 314655) +++ head/sbin/geom/core/Makefile (revision 314656) @@ -1,17 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../misc +.PATH: ${.CURDIR:H}/misc PACKAGE=runtime PROG= geom MAN= geom.8 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 .include Index: head/sbin/ggate/ggatec/Makefile =================================================================== --- head/sbin/ggate/ggatec/Makefile (revision 314655) +++ head/sbin/ggate/ggatec/Makefile (revision 314656) @@ -1,15 +1,15 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../shared +.PATH: ${.CURDIR:H}/shared PROG= ggatec MAN= ggatec.8 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 .include Index: head/sbin/ggate/ggated/Makefile =================================================================== --- head/sbin/ggate/ggated/Makefile (revision 314655) +++ head/sbin/ggate/ggated/Makefile (revision 314656) @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../shared +.PATH: ${.CURDIR:H}/shared PROG= ggated MAN= ggated.8 SRCS= ggated.c ggate.c LIBADD= pthread util -CFLAGS+= -I${.CURDIR}/../shared +CFLAGS+= -I${.CURDIR:H}/shared .include Index: head/sbin/ggate/ggatel/Makefile =================================================================== --- head/sbin/ggate/ggatel/Makefile (revision 314655) +++ head/sbin/ggate/ggatel/Makefile (revision 314656) @@ -1,14 +1,14 @@ # $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 .include Index: head/sbin/growfs/Makefile =================================================================== --- head/sbin/growfs/Makefile (revision 314655) +++ head/sbin/growfs/Makefile (revision 314656) @@ -1,29 +1,29 @@ # @(#)Makefile 8.8 (Berkeley) 6/21/2000 # # $TSHeader: src/sbin/growfs/Makefile,v 1.4 2000/12/05 19:45:24 tomsoft Exp $ # $FreeBSD$ # .include -.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 .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/sbin/gvinum/Makefile =================================================================== --- head/sbin/gvinum/Makefile (revision 314655) +++ head/sbin/gvinum/Makefile (revision 314656) @@ -1,15 +1,15 @@ # $FreeBSD$ PACKAGE=runtime PROG= gvinum 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 Index: head/sbin/hastctl/Makefile =================================================================== --- head/sbin/hastctl/Makefile (revision 314655) +++ head/sbin/hastctl/Makefile (revision 314656) @@ -1,42 +1,42 @@ # $FreeBSD$ .include PACKAGE=hast -.PATH: ${.CURDIR}/../hastd +.PATH: ${.CURDIR:H}/hastd PROG= hastctl SRCS= activemap.c SRCS+= crc32.c SRCS+= ebuf.c SRCS+= hast_checksum.c hast_compression.c hast_proto.c hastctl.c SRCS+= lzf.c SRCS+= metadata.c SRCS+= nv.c SRCS+= parse.y pjdlog.c SRCS+= proto.c proto_common.c proto_uds.c SRCS+= token.l SRCS+= subr.c SRCS+= y.tab.h 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" CFLAGS+=-DINET6 .endif # This is needed to have WARNS > 1. CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT LIBADD= md util YFLAGS+=-v CLEANFILES=y.tab.c y.tab.h y.output .include Index: head/sbin/init/Makefile =================================================================== --- head/sbin/init/Makefile (revision 314655) +++ head/sbin/init/Makefile (revision 314656) @@ -1,20 +1,20 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD$ PACKAGE=runtime PROG= init SRCS= init.c getmntopts.c MAN= init.8 PRECIOUSPROG= INSTALLFLAGS=-b -B.bak CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT LIBADD= util crypt # Needed for getmntopts.c -MOUNT= ${.CURDIR}/../../sbin/mount +MOUNT= ${SRCTOP}/sbin/mount CFLAGS+=-I${MOUNT} .PATH: ${MOUNT} NO_SHARED?= YES .include Index: head/sbin/ipf/Makefile.inc =================================================================== --- head/sbin/ipf/Makefile.inc (revision 314655) +++ head/sbin/ipf/Makefile.inc (revision 314656) @@ -1,32 +1,32 @@ # $FreeBSD$ .include 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" CFLAGS+= -DUSE_INET6 .else CFLAGS+= -DNOINET6 .endif .if ${.CURDIR:M*/libipf} == "" LIBADD+= ipf .endif 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" Index: head/sbin/ipf/ipf/Makefile =================================================================== --- head/sbin/ipf/ipf/Makefile (revision 314655) +++ head/sbin/ipf/ipf/Makefile (revision 314656) @@ -1,40 +1,40 @@ # $FreeBSD$ PACKAGE= ipf PROG= ipf SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c MAN= ipfilter.4 ipfilter.5 ipf.8 ipf.4 ipf.5 ipl.4 MLINKS= ipf.5 ipf.conf.5 ipf.5 ipf6.conf.5 CFLAGS+= -I. -DIPFILTER_BPF -DHAS_SYS_MD5_H GENHDRS= ipf_l.h ipf_y.h CLEANFILES+= ${GENHDRS} ipf_y.c ipf_l.c ipf_y.c: ipf_y.y ${YACC} -d ${.ALLSRC} sed -e 's/yy/ipf_yy/g' \ -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ y.tab.c > ${.TARGET} sed -e 's/yy/ipf_yy/g' \ y.tab.h > ${.TARGET:.c=.h} ipf_y.h: ipf_y.c ipf_l.c: lexer.c sed -e 's/yy/ipf_yy/g' \ -e 's/y.tab.h/ipf_y.h/' \ -e 's/lexer.h/ipf_l.h/' \ ${.ALLSRC} > ${.TARGET} ipf_l.h: lexer.h sed -e 's/yy/ipf_yy/g' \ ${.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 .endif .include Index: head/sbin/ipf/ipftest/Makefile =================================================================== --- head/sbin/ipf/ipftest/Makefile (revision 314655) +++ head/sbin/ipf/ipftest/Makefile (revision 314656) @@ -1,109 +1,109 @@ # $FreeBSD$ PACKAGE= ipf PROG= ipftest SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ ip_nat6.c \ ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ ip_pool.c ip_scan.c ip_sync.c ip_rules.c \ ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \ ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c ip_dstlist.c MAN= ipftest.1 WARNS?= 0 CFLAGS+= -DIPFILTER_LOG -DIPFILTER_COMPILED -DIPFILTER_LOOKUP \ -DIPFILTER_SYNC -DIPFILTER_CKSUM -DHAS_SYS_MD5_H -I. # XXX The original tarball does not define IPFILTER_SCAN when building this # XXX and other modules. It is believed the reason is it fails to build. # XXX It has been removed for now. # 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 CLEANFILES+= ipnat.tab.c ipnat.tab.h CLEANFILES+= ippool_y.c ippool_l.c CLEANFILES+= ippool.tab.c ippool.tab.h ipnat.tab.c ipnat.tab.h: ipnat_y.y ${YACC} -b ipnat -d ${.ALLSRC} ipnat_y.c: ipnat.tab.c sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ ipnat.tab.c > ${.TARGET} ipnat_y.h: ipnat.tab.h sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ ipnat.tab.h > ${.TARGET} ipnat_y.h: ipnat_y.c ipnat_l.c: lexer.c sed -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ -e 's/lexer.h/ipnat_l.h/' \ ${.ALLSRC} > ${.TARGET} ipnat_l.h: lexer.h sed -e 's/yy/ipnat_yy/g' \ ${.ALLSRC} > ${.TARGET} ippool.tab.c ippool.tab.h: ippool_y.y ${YACC} -b ippool -d ${.ALLSRC} ippool_y.c: ippool.tab.c sed -e 's/yy/ippool_yy/g' \ -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ ippool.tab.c > ${.TARGET} ippool_y.h: ippool.tab.h sed -e 's/yy/ippool_yy/g' \ ippool.tab.h > ${.TARGET} ippool_y.h: ippool_y.c ippool_l.c: lexer.c sed -e 's/yy/ippool_yy/g' \ -e 's/y.tab.h/ippool_y.h/' \ -e 's/lexer.h/ippool_l.h/' \ ${.ALLSRC} > ${.TARGET} ippool_l.h: lexer.h sed -e 's/yy/ippool_yy/g' \ ${.ALLSRC} > ${.TARGET} ipf.tab.c ipf.tab.h: ipf_y.y ${YACC} -b ipf -d ${.ALLSRC} ipf_y.c: ipf.tab.c sed -e 's/yy/ipf_yy/g' \ -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ ipf.tab.c > ${.TARGET} ipf_y.h: ipf.tab.h sed -e 's/yy/ipf_yy/g' \ ipf.tab.h > ${.TARGET} ipf_y.h: ipf_y.c ipf_l.c: lexer.c sed -e 's/yy/ipf_yy/g' \ -e 's/y.tab.h/ipf_y.h/' \ -e 's/lexer.h/ipf_l.h/' \ ${.ALLSRC} > ${.TARGET} ipf_l.h: lexer.h sed -e 's/yy/ipf_yy/g' \ ${.ALLSRC} > ${.TARGET} .include Index: head/sbin/ipf/ipresend/Makefile =================================================================== --- head/sbin/ipf/ipresend/Makefile (revision 314655) +++ head/sbin/ipf/ipresend/Makefile (revision 314656) @@ -1,10 +1,10 @@ # $FreeBSD$ PACKAGE= ipf 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 Index: head/sbin/iscontrol/Makefile =================================================================== --- head/sbin/iscontrol/Makefile (revision 314655) +++ head/sbin/iscontrol/Makefile (revision 314656) @@ -1,14 +1,14 @@ # $FreeBSD$ 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 MAN= iscontrol.8 .include Index: head/sbin/ldconfig/Makefile =================================================================== --- head/sbin/ldconfig/Makefile (revision 314655) +++ head/sbin/ldconfig/Makefile (revision 314656) @@ -1,12 +1,12 @@ # $FreeBSD$ 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 .PATH: ${LDDIR} .include Index: head/sbin/mksnap_ffs/Makefile =================================================================== --- head/sbin/mksnap_ffs/Makefile (revision 314655) +++ head/sbin/mksnap_ffs/Makefile (revision 314656) @@ -1,21 +1,21 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../mount +.PATH: ${.CURDIR:H}/mount PACKAGE=runtime PROG= mksnap_ffs 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 .else BINMODE=4554 BINOWN= root .endif BINGRP= operator .include Index: head/sbin/mount_cd9660/Makefile =================================================================== --- head/sbin/mount_cd9660/Makefile (revision 314655) +++ head/sbin/mount_cd9660/Makefile (revision 314656) @@ -1,19 +1,19 @@ # @(#)Makefile 8.3 (Berkeley) 3/27/94 # $FreeBSD$ PACKAGE=runtime PROG= mount_cd9660 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 # userland libiconv NO_SHARED?= NO .PATH: ${MOUNT} .include Index: head/sbin/mount_fusefs/Makefile =================================================================== --- head/sbin/mount_fusefs/Makefile (revision 314655) +++ head/sbin/mount_fusefs/Makefile (revision 314656) @@ -1,33 +1,33 @@ # $FreeBSD$ .if defined(DEBUG) DEBUG_FLAGS+= -D_DEBUG -g .endif .if defined(DEBUG2G) DEBUG_FLAGS+= -D_DEBUG2G -g .endif .if defined(DEBUG3G) DEBUG_FLAGS+= -D_DEBUG3G -g .endif .if defined(DEBUG_MSG) DEBUG_FLAGS+= -D_DEBUG_MSG .endif .if defined(F4BVERS) DEBUG_FLAGS+= -DFUSE4BSD_VERSION="\"${F4BVERS}\"" .endif PACKAGE=runtime 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} .include Index: head/sbin/mount_msdosfs/Makefile =================================================================== --- head/sbin/mount_msdosfs/Makefile (revision 314655) +++ head/sbin/mount_msdosfs/Makefile (revision 314656) @@ -1,20 +1,20 @@ # # $FreeBSD$ # PACKAGE=runtime PROG= mount_msdosfs 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 # userland libiconv NO_SHARED?= NO .PATH: ${MOUNT} .include Index: head/sbin/mount_nfs/Makefile =================================================================== --- head/sbin/mount_nfs/Makefile (revision 314655) +++ head/sbin/mount_nfs/Makefile (revision 314656) @@ -1,16 +1,16 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # # $FreeBSD$ PACKAGE=runtime 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} .include Index: head/sbin/mount_nullfs/Makefile =================================================================== --- head/sbin/mount_nullfs/Makefile (revision 314655) +++ head/sbin/mount_nullfs/Makefile (revision 314656) @@ -1,14 +1,14 @@ # @(#)Makefile 8.3 (Berkeley) 3/27/94 # $FreeBSD$ PACKAGE=runtime 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} .include Index: head/sbin/mount_udf/Makefile =================================================================== --- head/sbin/mount_udf/Makefile (revision 314655) +++ head/sbin/mount_udf/Makefile (revision 314656) @@ -1,17 +1,17 @@ # $FreeBSD$ PACKAGE=runtime PROG= mount_udf 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 # userland libiconv NO_SHARED?= NO .include Index: head/sbin/mount_unionfs/Makefile =================================================================== --- head/sbin/mount_unionfs/Makefile (revision 314655) +++ head/sbin/mount_unionfs/Makefile (revision 314656) @@ -1,14 +1,14 @@ # @(#)Makefile 8.3 (Berkeley) 3/27/94 # $FreeBSD$ PACKAGE=runtime 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} .include Index: head/sbin/newfs/Makefile =================================================================== --- head/sbin/newfs/Makefile (revision 314655) +++ head/sbin/newfs/Makefile (revision 314656) @@ -1,19 +1,19 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PROG= newfs LIBADD= ufs util SRCS= newfs.c mkfs.c geom_bsd_enc.c WARNS?= 3 MAN= newfs.8 .include 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 Index: head/sbin/nvmecontrol/Makefile =================================================================== --- head/sbin/nvmecontrol/Makefile (revision 314655) +++ head/sbin/nvmecontrol/Makefile (revision 314656) @@ -1,11 +1,11 @@ # $FreeBSD$ PACKAGE=runtime PROG= nvmecontrol SRCS= nvmecontrol.c devlist.c firmware.c identify.c logpage.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 Index: head/sbin/pfctl/Makefile =================================================================== --- head/sbin/pfctl/Makefile (revision 314655) +++ head/sbin/pfctl/Makefile (revision 314656) @@ -1,34 +1,34 @@ # $FreeBSD$ .include # pf_ruleset.c is shared between kernel and pfctl -.PATH: ${.CURDIR}/../../sys/netpfil/pf +.PATH: ${SRCTOP}/sys/netpfil/pf PACKAGE=pf PROG= pfctl MAN= pfctl.8 SRCS = pfctl.c parse.y pfctl_parser.c pf_print_state.c pfctl_altq.c SRCS+= pfctl_osfp.c pfctl_radix.c pfctl_table.c pfctl_qstats.c SRCS+= pfctl_optimize.c SRCS+= pf_ruleset.c WARNS?= 2 CFLAGS+= -Wall -Wmissing-prototypes -Wno-uninitialized CFLAGS+= -Wstrict-prototypes CFLAGS+= -DENABLE_ALTQ -I${.CURDIR} # Need to use "WITH_" prefix to not conflict with the l/y INET/INET6 keywords .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DWITH_INET6 .endif .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DWITH_INET .endif YFLAGS= LIBADD= m md .include Index: head/sbin/pflogd/Makefile =================================================================== --- head/sbin/pflogd/Makefile (revision 314655) +++ head/sbin/pflogd/Makefile (revision 314656) @@ -1,17 +1,17 @@ # $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 WARNS?= 2 .include Index: head/sbin/quotacheck/Makefile =================================================================== --- head/sbin/quotacheck/Makefile (revision 314655) +++ head/sbin/quotacheck/Makefile (revision 314656) @@ -1,13 +1,13 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/5/93 PACKAGE=quotacheck PROG= quotacheck SRCS= quotacheck.c preen.c fsutil.c utilities.c WARNS?= 2 MAN= quotacheck.8 LIBADD= util -.PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs +.PATH: ${.CURDIR:H}/fsck ${.CURDIR:H}/fsck_ffs .include Index: head/sbin/resolvconf/Makefile =================================================================== --- head/sbin/resolvconf/Makefile (revision 314655) +++ head/sbin/resolvconf/Makefile (revision 314656) @@ -1,39 +1,39 @@ # $FreeBSD$ PACKAGE=runtime -DIST= ${.CURDIR}/../../contrib/openresolv +DIST= ${SRCTOP}/contrib/openresolv .PATH: ${DIST} SCRIPTS= resolvconf FILES= libc dnsmasq named pdnsd pdns_recursor unbound FILESDIR= /libexec/resolvconf MAN= resolvconf.conf.5 resolvconf.8 CLEANFILES= ${SCRIPTS} ${FILES} ${MAN} SYSCONFDIR= /etc RCDIR= ${SYSCONFDIR}/rc.d VARDIR= /var/run/resolvconf SBINDIR= /sbin # We don't assume to restart the services in /sbin. So, though # our service(8) is in /usr/sbin, we can use it, here. CMD1= \\$$1 onestatus >/dev/null 2>\&1 CMD2= \\$$1 restart RESTARTCMD= "/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}" .for f in ${SCRIPTS} ${FILES} ${MAN} ${f}: ${f}.in sed -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \ -e 's:@LIBEXECDIR@:${FILESDIR}:g' \ -e 's:@VARDIR@:${VARDIR}:g' \ -e 's:@RESTARTCMD@:${RESTARTCMD}:g' \ -e 's:@RCDIR@:${RCDIR}:g' \ -e 's:@SBINDIR@:${SBINDIR}:g' \ -e 's: vpn : ng[0-9]*&:g' \ ${DIST}/$@.in > $@ .endfor .include Index: head/sbin/restore/Makefile =================================================================== --- head/sbin/restore/Makefile (revision 314655) +++ head/sbin/restore/Makefile (revision 314656) @@ -1,16 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../dump +.PATH: ${.CURDIR:H}/dump PACKAGE=runtime PROG= restore LINKS= ${BINDIR}/restore ${BINDIR}/rrestore MAN= restore.8 MLINKS= restore.8 rrestore.8 SRCS= main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \ dumprmt.c WARNS?= 2 CFLAGS+= -DRRESTORE -D_ACL_PRIVATE .include Index: head/sbin/rtsol/Makefile =================================================================== --- head/sbin/rtsol/Makefile (revision 314655) +++ head/sbin/rtsol/Makefile (revision 314656) @@ -1,27 +1,27 @@ # Copyright (c) 1996 WIDE Project. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modifications, are permitted provided that the above copyright notice # and this paragraph are duplicated in all such forms and that any # documentation, advertising materials, and other materials related to # such distribution and use acknowledge that the software was developed # by the WIDE Project, Japan. The name of the Project may not be used to # endorse or promote products derived from this software without # specific prior written permission. THIS SOFTWARE IS PROVIDED ``AS IS'' # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. # # $FreeBSD$ -.PATH: ${.CURDIR}/../../usr.sbin/rtsold +.PATH: ${SRCTOP}/usr.sbin/rtsold PACKAGE=runtime PROG= rtsol SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c MAN= WARNS?= 3 CFLAGS+= -DSMALL .include Index: head/sbin/setkey/Makefile =================================================================== --- head/sbin/setkey/Makefile (revision 314655) +++ head/sbin/setkey/Makefile (revision 314656) @@ -1,68 +1,68 @@ # Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project. # All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # 3. Neither the name of the project nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # # $FreeBSD$ .include PACKAGE=runtime PROG= setkey 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 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 CFLAGS+= -DIPSEC_DEBUG -DYY_NO_UNPUT .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif CFLAGS+= -I. LIBADD+= ipsec CLEANFILES+= scriptdump y.tab.h #SCRIPTS= scriptdump LOCALPREFIX= /usr/local scriptdump: scriptdump.pl sed -e 's#@LOCALPREFIX@#${LOCALPREFIX}#' < $> > scriptdump .include Index: head/sbin/sunlabel/Makefile =================================================================== --- head/sbin/sunlabel/Makefile (revision 314655) +++ head/sbin/sunlabel/Makefile (revision 314656) @@ -1,22 +1,22 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/geom +.PATH: ${SRCTOP}/sys/geom PROG= sunlabel SRCS= sunlabel.c geom_sunlabel_enc.c MAN= sunlabel.8 .if ${MACHINE_CPUARCH} == "sparc64" LINKS= ${BINDIR}/sunlabel ${BINDIR}/disklabel MLINKS= sunlabel.8 disklabel.8 .endif LIBADD= geom .include test: ${PROG} sh ${.CURDIR}/runtest.sh testx: ${PROG} sh -x ${.CURDIR}/runtest.sh Index: head/sbin/umount/Makefile =================================================================== --- head/sbin/umount/Makefile (revision 314655) +++ head/sbin/umount/Makefile (revision 314656) @@ -1,16 +1,16 @@ # @(#)Makefile 8.4 (Berkeley) 6/22/95 # # $FreeBSD$ PACKAGE=runtime 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} .include