Index: usr.bin/bzip2/Makefile =================================================================== --- usr.bin/bzip2/Makefile +++ usr.bin/bzip2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2 Index: usr.bin/bzip2recover/Makefile =================================================================== --- usr.bin/bzip2recover/Makefile +++ usr.bin/bzip2recover/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2recover Index: usr.bin/chkey/Makefile =================================================================== --- usr.bin/chkey/Makefile +++ usr.bin/chkey/Makefile @@ -2,11 +2,11 @@ .include -.PATH: ${.CURDIR}/../newkey +.PATH: ${SRCTOP}/usr.bin/newkey PROG= chkey SRCS= chkey.c generic.c update.c -CFLAGS+= -I${.CURDIR}/../newkey +CFLAGS+= -I${SRCTOP}/usr.bin/newkey .if ${MK_NIS} != "no" CFLAGS+= -DYP .endif Index: usr.bin/chpass/Makefile =================================================================== --- usr.bin/chpass/Makefile +++ usr.bin/chpass/Makefile @@ -3,7 +3,7 @@ .include -.PATH: ${.CURDIR}/../../usr.sbin/pwd_mkdb ${.CURDIR}/../../lib/libc/gen +.PATH: ${SRCTOP}/usr.sbin/pwd_mkdb ${SRCTOP}/lib/libc/gen PROG= chpass SRCS= chpass.c edit.c field.c pw_scan.c table.c util.c @@ -15,7 +15,7 @@ .endif #Some people need this, uncomment to activate #CFLAGS+=-DRESTRICT_FULLNAME_CHANGE -CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I. +CFLAGS+=-I${SRCTOP}/usr.sbin/pwd_mkdb -I${SRCTOP}/lib/libc/gen -I. LIBADD= crypt util .if ${MK_NIS} != "no" Index: usr.bin/compile_et/Makefile =================================================================== --- usr.bin/compile_et/Makefile +++ usr.bin/compile_et/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/com_err +.PATH: ${SRCTOP}/contrib/com_err PROG= compile_et SRCS= compile_et.c parse.y lex.l LIBADD= roken vers -CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err +CFLAGS+=-I. -I${SRCTOP}/contrib/com_err WARNS?= 0 Index: usr.bin/cpio/Makefile =================================================================== --- usr.bin/cpio/Makefile +++ usr.bin/cpio/Makefile @@ -2,8 +2,8 @@ .include -_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive -_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive +_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive PROG= bsdcpio BSDCPIO_VERSION_STRING= 3.3.1 Index: usr.bin/ctlstat/Makefile =================================================================== --- usr.bin/ctlstat/Makefile +++ usr.bin/ctlstat/Makefile @@ -2,7 +2,7 @@ PROG= ctlstat MAN= ctlstat.8 -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys CFLAGS+= -I${SDIR} .include Index: usr.bin/drill/Makefile =================================================================== --- usr.bin/drill/Makefile +++ usr.bin/drill/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # Vendor sources and generated files -LDNSDIR= ${.CURDIR}/../../contrib/ldns +LDNSDIR= ${SRCTOP}/contrib/ldns .PATH: ${LDNSDIR}/drill Index: usr.bin/ee/Makefile =================================================================== --- usr.bin/ee/Makefile +++ usr.bin/ee/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ee +.PATH: ${SRCTOP}/contrib/ee CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_SYS_WAIT @@ -29,7 +29,7 @@ . if exists(${.CURDIR}/nls/${lang}/ee.msg) NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang} . else -NLSSRCDIR_${lang}= ${.CURDIR}/../../contrib/ee +NLSSRCDIR_${lang}= ${SRCTOP}/contrib/ee . endif .endfor Index: usr.bin/elfcopy/Makefile =================================================================== --- usr.bin/elfcopy/Makefile +++ usr.bin/elfcopy/Makefile @@ -28,7 +28,7 @@ # This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes +# solution is to include SRCTOP/sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # Index: usr.bin/factor/Makefile =================================================================== --- usr.bin/factor/Makefile +++ usr.bin/factor/Makefile @@ -5,7 +5,7 @@ PROG= factor SRCS= factor.c pr_tbl.c -CFLAGS+=-I${.CURDIR}/../primes +CFLAGS+=-I${SRCTOP}/usr.bin/primes .if ${MK_OPENSSL} != "no" CFLAGS+=-DHAVE_OPENSSL @@ -14,6 +14,6 @@ MAN= factor.6 MLINKS+=factor.6 primes.6 -.PATH: ${.CURDIR}/../primes +.PATH: ${SRCTOP}/usr.bin/primes .include Index: usr.bin/file/Makefile =================================================================== --- usr.bin/file/Makefile +++ usr.bin/file/Makefile @@ -20,7 +20,7 @@ # ever read sources, credits must appear in the documentation. # 4. This notice may not be removed or altered. -SRCDIR= ${.CURDIR}/../../contrib/file +SRCDIR= ${SRCTOP}/contrib/file .PATH: ${SRCDIR}/src .PATH: ${SRCDIR}/doc @@ -29,12 +29,12 @@ MAGICPATH?= /usr/share/misc CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR}/../../lib/libmagic +CFLAGS+= -I${SRCTOP}/lib/libmagic LIBADD= magic FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \ - ${.CURDIR}/../../lib/libmagic/config.h + ${SRCTOP}/lib/libmagic/config.h CLEANFILES+= ${MAN} Index: usr.bin/ftp/Makefile =================================================================== --- usr.bin/ftp/Makefile +++ usr.bin/ftp/Makefile @@ -8,7 +8,7 @@ # #CFLAGS+=-DGATE_SERVER=\"ftp-gw.host\" # -DGATE_PORT=21 -TNFTP= ${.CURDIR}/../../contrib/tnftp +TNFTP= ${SRCTOP}/contrib/tnftp .PATH: ${TNFTP}/src PROG= ftp Index: usr.bin/host/Makefile =================================================================== --- usr.bin/host/Makefile +++ usr.bin/host/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -LDNSDIR= ${.CURDIR}/../../contrib/ldns -LDNSHOSTDIR= ${.CURDIR}/../../contrib/ldns-host +LDNSDIR= ${SRCTOP}/contrib/ldns +LDNSHOSTDIR= ${SRCTOP}/contrib/ldns-host .PATH: ${LDNSHOSTDIR} Index: usr.bin/ipcrm/Makefile =================================================================== --- usr.bin/ipcrm/Makefile +++ usr.bin/ipcrm/Makefile @@ -3,8 +3,8 @@ PROG= ipcrm SRCS= ipcrm.c ipc.c LIBADD= kvm -CFLAGS+=-I${.CURDIR}/../ipcs -.PATH: ${.CURDIR}/../ipcs +CFLAGS+=-I${SRCTOP}/usr.bin/ipcs +.PATH: ${SRCTOP}/usr.bin/ipcs WARNS?= 0 Index: usr.bin/iscsictl/Makefile =================================================================== --- usr.bin/iscsictl/Makefile +++ usr.bin/iscsictl/Makefile @@ -4,7 +4,7 @@ PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi +CFLAGS+= -I${SRCTOP}/sys/dev/iscsi MAN= iscsi.conf.5 iscsictl.8 LIBADD= xo Index: usr.bin/kdump/Makefile =================================================================== --- usr.bin/kdump/Makefile +++ usr.bin/kdump/Makefile @@ -3,11 +3,11 @@ .include -.PATH: ${.CURDIR}/../ktrace +.PATH: ${SRCTOP}/usr.bin/ktrace PROG= kdump SRCS= kdump.c subr.c -CFLAGS+= -I${.CURDIR}/../ktrace #-I${.CURDIR}/../... +CFLAGS+= -I${SRCTOP}/usr.bin/ktrace LIBADD= sysdecode .if ${MK_CASPER} != "no" Index: usr.bin/less/Makefile.common =================================================================== --- usr.bin/less/Makefile.common +++ usr.bin/less/Makefile.common @@ -1,9 +1,9 @@ # $FreeBSD$ -LSDIR= ${.CURDIR}/../../contrib/less +LSDIR= ${SRCTOP}/contrib/less .PATH: ${LSDIR} -CFLAGS+=-I${.CURDIR}/../less -I${LSDIR} +CFLAGS+=-I${SRCTOP}/usr.bin/less -I${LSDIR} WARNS?= 1 .SUFFIXES: .nro .1 Index: usr.bin/lessecho/Makefile =================================================================== --- usr.bin/lessecho/Makefile +++ usr.bin/lessecho/Makefile @@ -4,5 +4,5 @@ SRCS= lessecho.c version.c CLEANFILES= lessecho.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include Index: usr.bin/lesskey/Makefile =================================================================== --- usr.bin/lesskey/Makefile +++ usr.bin/lesskey/Makefile @@ -4,5 +4,5 @@ SRCS= lesskey.c version.c CLEANFILES= lesskey.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include Index: usr.bin/lex/Makefile =================================================================== --- usr.bin/lex/Makefile +++ usr.bin/lex/Makefile @@ -14,7 +14,7 @@ LINKS+= ${BINDIR}/lex ${BINDIR}/flex LINKS+= ${BINDIR}/lex ${BINDIR}/flex++ -FLEXDIR= ${.CURDIR}/../../contrib/flex +FLEXDIR= ${SRCTOP}/contrib/flex .PATH: ${FLEXDIR} Index: usr.bin/locale/Makefile =================================================================== --- usr.bin/locale/Makefile +++ usr.bin/locale/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= locale -CFLAGS+= -I${.CURDIR}/../../lib/libc/locale +CFLAGS+= -I${SRCTOP}/lib/libc/locale .include Index: usr.bin/localedef/Makefile =================================================================== --- usr.bin/localedef/Makefile +++ usr.bin/localedef/Makefile @@ -20,7 +20,7 @@ IGNORE_PRAGMA= yes CFLAGS+= -I. -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../../lib/libc/locale -CFLAGS+= -I${.CURDIR}/../../lib/libc/stdtime +CFLAGS+= -I${SRCTOP}/lib/libc/locale +CFLAGS+= -I${SRCTOP}/lib/libc/stdtime .include Index: usr.bin/lzmainfo/Makefile =================================================================== --- usr.bin/lzmainfo/Makefile +++ usr.bin/lzmainfo/Makefile @@ -2,8 +2,8 @@ PROG= lzmainfo -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/lzmainfo SRCS+= lzmainfo.c Index: usr.bin/m4/Makefile =================================================================== --- usr.bin/m4/Makefile +++ usr.bin/m4/Makefile @@ -7,7 +7,7 @@ .include PROG= m4 -CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libopenbsd +CFLAGS+=-DEXTENDED -I${.CURDIR} -I${SRCTOP}/lib/libopenbsd LIBADD= y l m openbsd NO_WMISSING_VARIABLE_DECLARATIONS= Index: usr.bin/mandoc/Makefile =================================================================== --- usr.bin/mandoc/Makefile +++ usr.bin/mandoc/Makefile @@ -2,7 +2,7 @@ .include -MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml +MDOCMLDIR= ${SRCTOP}/contrib/mdocml .PATH: ${MDOCMLDIR} PROG= mandoc @@ -89,7 +89,7 @@ WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ - -I${.CURDIR}/../../lib/libopenbsd/ + -I${SRCTOP}/lib/libopenbsd/ LIBADD= openbsd z .include Index: usr.bin/minigzip/Makefile =================================================================== --- usr.bin/minigzip/Makefile +++ usr.bin/minigzip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../contrib/zlib/test +SRCDIR= ${SRCTOP}/contrib/zlib/test .PATH: ${SRCDIR} PROG= minigzip Index: usr.bin/mkcsmapper/Makefile =================================================================== --- usr.bin/mkcsmapper/Makefile +++ usr.bin/mkcsmapper/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv PROG= mkcsmapper -LDFLAGS+= -L${.CURDIR}/../../lib/libc +LDFLAGS+= -L${SRCTOP}/lib/libc NO_WMISSING_VARIABLE_DECLARATIONS= Index: usr.bin/mkcsmapper_static/Makefile =================================================================== --- usr.bin/mkcsmapper_static/Makefile +++ usr.bin/mkcsmapper_static/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkcsmapper +.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper PROG= mkcsmapper_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ @@ -11,7 +11,7 @@ build-tools: mkcsmapper_static -.include "${.CURDIR}/../mkcsmapper/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkcsmapper/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} Index: usr.bin/mkesdb/Makefile =================================================================== --- usr.bin/mkesdb/Makefile +++ usr.bin/mkesdb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb Index: usr.bin/mkesdb_static/Makefile =================================================================== --- usr.bin/mkesdb_static/Makefile +++ usr.bin/mkesdb_static/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv ${.CURDIR}/../mkesdb +.PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb PROG= mkesdb_static SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ @@ -11,7 +11,7 @@ build-tools: mkesdb_static -.include "${.CURDIR}/../mkesdb/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkesdb/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} Index: usr.bin/mklocale/Makefile =================================================================== --- usr.bin/mklocale/Makefile +++ usr.bin/mklocale/Makefile @@ -3,7 +3,7 @@ PROG= mklocale SRCS= yacc.y lex.l y.tab.h -CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale +CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/lib/libc/locale NO_WMISSING_VARIABLE_DECLARATIONS= Index: usr.bin/nc/Makefile =================================================================== --- usr.bin/nc/Makefile +++ usr.bin/nc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/netcat +.PATH: ${SRCTOP}/contrib/netcat PROG= nc SRCS= netcat.c atomicio.c socks.c Index: usr.bin/opieinfo/Makefile =================================================================== --- usr.bin/opieinfo/Makefile +++ usr.bin/opieinfo/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opieinfo -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE Index: usr.bin/opiekey/Makefile =================================================================== --- usr.bin/opiekey/Makefile +++ usr.bin/opiekey/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opiekey -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE Index: usr.bin/opiepasswd/Makefile =================================================================== --- usr.bin/opiepasswd/Makefile +++ usr.bin/opiepasswd/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ # -OPIE_DIST?= ${.CURDIR}/../../contrib/opie +OPIE_DIST?= ${SRCTOP}/contrib/opie PROG= opiepasswd -CFLAGS+=-I${.CURDIR}/../../lib/libopie +CFLAGS+=-I${SRCTOP}/lib/libopie CFLAGS+=-I${OPIE_DIST} CFLAGS+=-DINSECURE_OVERRIDE Index: usr.bin/pamtest/Makefile =================================================================== --- usr.bin/pamtest/Makefile +++ usr.bin/pamtest/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -OPENPAM= ${.CURDIR}/../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest PROG= pamtest Index: usr.bin/readelf/Makefile =================================================================== --- usr.bin/readelf/Makefile +++ usr.bin/readelf/Makefile @@ -14,7 +14,7 @@ # This same hack is in lib/libelf/Makefile and lib/libdwarf/Makefile # We need to link against the correct version of these files. One -# solution is to include ../../sys in the include path. This causes +# solution is to include SRCTOP/sys in the include path. This causes # problems when a header file in sys depends on a file in another # part of the tree, e.g. a machine dependent header. # Index: usr.bin/rsh/Makefile =================================================================== --- usr.bin/rsh/Makefile +++ usr.bin/rsh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= rsh -CFLAGS+=-I${.CURDIR}/../../libexec/rlogind +CFLAGS+=-I${SRCTOP}/libexec/rlogind PACKAGE=rcmds Index: usr.bin/smbutil/Makefile =================================================================== --- usr.bin/smbutil/Makefile +++ usr.bin/smbutil/Makefile @@ -5,7 +5,7 @@ LIBADD= smb -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +CONTRIBDIR= ${SRCTOP}/contrib/smbfs CFLAGS+= -I${CONTRIBDIR}/include WARNS?= 0 Index: usr.bin/tar/Makefile =================================================================== --- usr.bin/tar/Makefile +++ usr.bin/tar/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .include -_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive +_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive PROG= bsdtar BSDTAR_VERSION_STRING= 3.3.1 @@ -27,7 +27,7 @@ .endif CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../lib/libarchive/config_freebsd.h\" +CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/libarchive CFLAGS+= -I${_LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar Index: usr.bin/telnet/Makefile =================================================================== --- usr.bin/telnet/Makefile +++ usr.bin/telnet/Makefile @@ -2,7 +2,7 @@ .include -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnet PROG= telnet Index: usr.bin/tftp/Makefile =================================================================== --- usr.bin/tftp/Makefile +++ usr.bin/tftp/Makefile @@ -1,12 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -.PATH: ${.CURDIR}/../../libexec/tftpd +.PATH: ${SRCTOP}/libexec/tftpd PROG= tftp SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c SRCS+= tftp-utils.c tftp.c -CFLAGS+=-I${.CURDIR}/../../libexec/tftpd +CFLAGS+=-I${SRCTOP}/libexec/tftpd LIBADD= edit Index: usr.bin/top/Makefile =================================================================== --- usr.bin/top/Makefile +++ usr.bin/top/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -TOPDIR= ${.CURDIR}/../../contrib/top +TOPDIR= ${SRCTOP}/contrib/top .PATH: ${TOPDIR} PROG= top @@ -24,7 +24,7 @@ LIBADD= ncursesw m kvm jail CLEANFILES= sigdesc.h -SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk +SIGCONV_AWK= ${SRCTOP}/contrib/top/sigconv.awk STAGED_INCLUDE_DIR?= ${DESTDIR}/usr/include SIGNAL_H= ${STAGED_INCLUDE_DIR}/sys/signal.h sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H} Index: usr.bin/truss/Makefile =================================================================== --- usr.bin/truss/Makefile +++ usr.bin/truss/Makefile @@ -6,8 +6,8 @@ LIBADD= sysdecode -#CFLAGS+= -I${.CURDIR} -I. -I${.CURDIR}/../../sys -CFLAGS+= -I${.CURDIR}/../../sys +#CFLAGS+= -I${.CURDIR} -I. -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/sys ABIS+= freebsd # Each ABI is expected to have an ABI.c, MACHINE_ARCH-ABI.c or Index: usr.bin/unvis/Makefile =================================================================== --- usr.bin/unvis/Makefile +++ usr.bin/unvis/Makefile @@ -3,6 +3,6 @@ PROG= unvis -.PATH: ${.CURDIR}/../../contrib/unvis +.PATH: ${SRCTOP}/contrib/unvis .include Index: usr.bin/vacation/Makefile =================================================================== --- usr.bin/vacation/Makefile +++ usr.bin/vacation/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail +SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation PROG= vacation Index: usr.bin/vi/Makefile =================================================================== --- usr.bin/vi/Makefile +++ usr.bin/vi/Makefile @@ -5,7 +5,7 @@ .include PACKAGE= vi -SRCDIR= ${.CURDIR}/../../contrib/nvi +SRCDIR= ${SRCTOP}/contrib/nvi SUBDIR+= catalog WARNS?= 0 # some warn issues on 32 bit machines Index: usr.bin/vis/Makefile =================================================================== --- usr.bin/vis/Makefile +++ usr.bin/vis/Makefile @@ -4,7 +4,7 @@ PROG= vis SRCS= vis.c foldit.c -.PATH: ${.CURDIR}/../../contrib/vis -CFLAGS+= -I${.CURDIR}/../../contrib/vis +.PATH: ${SRCTOP}/contrib/vis +CFLAGS+= -I${SRCTOP}/contrib/vis .include Index: usr.bin/w/Makefile =================================================================== --- usr.bin/w/Makefile +++ usr.bin/w/Makefile @@ -7,6 +7,6 @@ LIBADD= kvm sbuf xo util LINKS= ${BINDIR}/w ${BINDIR}/uptime -.PATH: ${.CURDIR}/../../bin/ps +.PATH: ${SRCTOP}/bin/ps .include Index: usr.bin/xinstall/Makefile =================================================================== --- usr.bin/xinstall/Makefile +++ usr.bin/xinstall/Makefile @@ -8,9 +8,9 @@ SRCS= xinstall.c getid.c MAN= install.1 -.PATH: ${.CURDIR}/../../contrib/mtree -CFLAGS+= -I${.CURDIR}/../../contrib/mtree -CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +.PATH: ${SRCTOP}/contrib/mtree +CFLAGS+= -I${SRCTOP}/contrib/mtree +CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD= md Index: usr.bin/xz/Makefile =================================================================== --- usr.bin/xz/Makefile +++ usr.bin/xz/Makefile @@ -10,8 +10,8 @@ MLINKS= xz.1 unxz.1 xz.1 lzma.1 xz.1 unlzma.1 xz.1 xzcat.1 xz.1 lzcat.1 -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/xz Index: usr.bin/xzdec/Makefile =================================================================== --- usr.bin/xzdec/Makefile +++ usr.bin/xzdec/Makefile @@ -6,8 +6,8 @@ MLINKS= xzdec.1 lzmadec.1 -XZDIR= ${.CURDIR}/../../contrib/xz/src -LZMALIBDIR= ${.CURDIR}/../../lib/liblzma +XZDIR= ${SRCTOP}/contrib/xz/src +LZMALIBDIR= ${SRCTOP}/lib/liblzma .PATH: ${XZDIR}/xzdec Index: usr.bin/yacc/Makefile =================================================================== --- usr.bin/yacc/Makefile +++ usr.bin/yacc/Makefile @@ -3,7 +3,7 @@ .include -BYACC_SRC= ${.CURDIR}/../../contrib/byacc +BYACC_SRC= ${SRCTOP}/contrib/byacc .PATH: ${BYACC_SRC} PROG= yacc Index: usr.bin/ypwhich/Makefile =================================================================== --- usr.bin/ypwhich/Makefile +++ usr.bin/ypwhich/Makefile @@ -1,7 +1,7 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 # $FreeBSD$ -YPSERV=${.CURDIR}/../../usr.sbin/ypserv/common +YPSERV=${SRCTOP}/usr.sbin/ypserv/common .PATH: ${YPSERV} PROG= ypwhich