From a35f04fba2ebb8f86d4cbdc710c89a094572b08e Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 12 Mar 2017 18:58:44 +0000 Subject: [PATCH] Adopt SRCTOP in usr.bin Prefer ${SRCTOP}/foo over ${.CURDIR}/../../foo and ${SRCTOP}/usr.bin/foo over ${.CURDIR}/../foo for paths in Makefiles. Differential Revision: https://reviews.freebsd.org/D9932 Sponsored by: Netflix Silence on: arch@ (twice) --- usr.bin/bsdiff/bsdiff/Makefile | 4 ++-- usr.bin/bzip2/Makefile | 2 +- usr.bin/bzip2recover/Makefile | 2 +- usr.bin/chkey/Makefile | 4 ++-- usr.bin/chpass/Makefile | 4 ++-- usr.bin/compile_et/Makefile | 4 ++-- usr.bin/cpio/Makefile | 4 ++-- usr.bin/ctlstat/Makefile | 2 +- usr.bin/drill/Makefile | 2 +- usr.bin/ee/Makefile | 4 ++-- usr.bin/elfcopy/Makefile | 2 +- usr.bin/factor/Makefile | 4 ++-- usr.bin/file/Makefile | 6 +++--- usr.bin/ftp/Makefile | 2 +- usr.bin/host/Makefile | 4 ++-- usr.bin/ipcrm/Makefile | 4 ++-- usr.bin/iscsictl/Makefile | 2 +- usr.bin/kdump/Makefile | 4 ++-- usr.bin/less/Makefile.common | 4 ++-- usr.bin/lessecho/Makefile | 2 +- usr.bin/lesskey/Makefile | 2 +- usr.bin/lex/Makefile | 2 +- usr.bin/lex/lib/Makefile | 2 +- usr.bin/locale/Makefile | 2 +- usr.bin/localedef/Makefile | 4 ++-- usr.bin/lzmainfo/Makefile | 4 ++-- usr.bin/m4/Makefile | 2 +- usr.bin/mandoc/Makefile | 4 ++-- usr.bin/minigzip/Makefile | 2 +- usr.bin/mkcsmapper/Makefile | 4 ++-- usr.bin/mkcsmapper/Makefile.inc | 6 +++--- usr.bin/mkcsmapper_static/Makefile | 4 ++-- usr.bin/mkesdb/Makefile | 2 +- usr.bin/mkesdb_static/Makefile | 4 ++-- usr.bin/mklocale/Makefile | 2 +- usr.bin/nc/Makefile | 2 +- usr.bin/opieinfo/Makefile | 4 ++-- usr.bin/opiekey/Makefile | 4 ++-- usr.bin/opiepasswd/Makefile | 4 ++-- usr.bin/pamtest/Makefile | 2 +- usr.bin/readelf/Makefile | 2 +- usr.bin/rsh/Makefile | 2 +- usr.bin/smbutil/Makefile | 2 +- usr.bin/svn/lib/Makefile.inc | 10 +++++----- usr.bin/tar/Makefile | 4 ++-- usr.bin/telnet/Makefile | 2 +- usr.bin/tftp/Makefile | 4 ++-- usr.bin/top/Makefile | 4 ++-- usr.bin/truss/Makefile | 4 ++-- usr.bin/unvis/Makefile | 2 +- usr.bin/vacation/Makefile | 2 +- usr.bin/vi/Makefile | 2 +- usr.bin/vis/Makefile | 4 ++-- usr.bin/w/Makefile | 2 +- usr.bin/xinstall/Makefile | 6 +++--- usr.bin/xz/Makefile | 4 ++-- usr.bin/xzdec/Makefile | 4 ++-- usr.bin/yacc/Makefile | 2 +- usr.bin/ypwhich/Makefile | 2 +- 59 files changed, 96 insertions(+), 96 deletions(-) diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile index 44c78a1f8d1b..70f7f2d0ecba 100644 --- a/usr.bin/bsdiff/bsdiff/Makefile +++ b/usr.bin/bsdiff/bsdiff/Makefile @@ -4,11 +4,11 @@ PROG= bsdiff # libdivsufsort configured with: # cmake -DCMAKE_BUILD_TYPE="Release" -DBUILD_DIVSUFSORT64=ON -.PATH: ${.CURDIR}/../../../contrib/libdivsufsort/lib +.PATH: ${SRCTOP}/contrib/libdivsufsort/lib CFLAGS+= -DHAVE_CONFIG_H=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CFLAGS+= -D_LARGE_FILES -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS CFLAGS+= -D__STDC_LIMIT_MACROS -DBUILD_DIVSUFSORT64 -CFLAGS+= -I${.CURDIR}/../../../contrib/libdivsufsort/include -I${.CURDIR} +CFLAGS+= -I${SRCTOP}/contrib/libdivsufsort/include -I${.CURDIR} SRCS= divsufsort.c sssort.c trsort.c utils.c SRCS+= bsdiff.c diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile index 5cb33b3d689d..c743262d8c81 100644 --- a/usr.bin/bzip2/Makefile +++ b/usr.bin/bzip2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2 diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile index 97b9615b05e3..7cbb5482f3a6 100644 --- a/usr.bin/bzip2recover/Makefile +++ b/usr.bin/bzip2recover/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -BZ2DIR= ${.CURDIR}/../../contrib/bzip2 +BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} PROG= bzip2recover diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index 4f47b9cccccf..781adc86ef7a 100644 --- a/usr.bin/chkey/Makefile +++ b/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 diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index 266ca5ad1d3d..fb70df886ee2 100644 --- a/usr.bin/chpass/Makefile +++ b/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 @@ CFLAGS+= -DYP .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" diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile index 8af87ae10173..aeccbf3fd55f 100644 --- a/usr.bin/compile_et/Makefile +++ b/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 diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index d9a2d2822458..84b7cfbe6a39 100644 --- a/usr.bin/cpio/Makefile +++ b/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 diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile index 0c091847e0df..31182374f381 100644 --- a/usr.bin/ctlstat/Makefile +++ b/usr.bin/ctlstat/Makefile @@ -2,7 +2,7 @@ PROG= ctlstat MAN= ctlstat.8 -SDIR= ${.CURDIR}/../../sys +SDIR= ${SRCTOP}/sys CFLAGS+= -I${SDIR} .include diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile index 0de0ae52c2fc..8cf0e682e36f 100644 --- a/usr.bin/drill/Makefile +++ b/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 diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index ee437071521e..c30a510a510c 100644 --- a/usr.bin/ee/Makefile +++ b/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 @@ NLSSRCFILES=ee.msg . 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 diff --git a/usr.bin/elfcopy/Makefile b/usr.bin/elfcopy/Makefile index 6b2baf06040e..5fc78a0186d9 100644 --- a/usr.bin/elfcopy/Makefile +++ b/usr.bin/elfcopy/Makefile @@ -28,7 +28,7 @@ LINKS= ${BINDIR}/${PROG} ${BINDIR}/strip # 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. # diff --git a/usr.bin/factor/Makefile b/usr.bin/factor/Makefile index 58da816439ef..dd7466302263 100644 --- a/usr.bin/factor/Makefile +++ b/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 @@ LIBADD+=crypto MAN= factor.6 MLINKS+=factor.6 primes.6 -.PATH: ${.CURDIR}/../primes +.PATH: ${SRCTOP}/usr.bin/primes .include diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index 70c211bd76db..f31c50ad86da 100644 --- a/usr.bin/file/Makefile +++ b/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 @@ PROG= file 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} diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 18068a64d454..e7de6e6c496c 100644 --- a/usr.bin/ftp/Makefile +++ b/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 diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile index 5c2ce52b542c..a2ab92862783 100644 --- a/usr.bin/host/Makefile +++ b/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} diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile index 990b9f93f6bb..bc30023ab846 100644 --- a/usr.bin/ipcrm/Makefile +++ b/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 diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile index 72eae155c524..d7a49d050db5 100644 --- a/usr.bin/iscsictl/Makefile +++ b/usr.bin/iscsictl/Makefile @@ -4,7 +4,7 @@ PACKAGE= iscsi 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 diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index e77e241bb4c8..c91704efdeda 100644 --- a/usr.bin/kdump/Makefile +++ b/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" diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common index cffb85a1f30b..29862adcd1e2 100644 --- a/usr.bin/less/Makefile.common +++ b/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 diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile index bb8d1a68c5dc..af0a7c1550ab 100644 --- a/usr.bin/lessecho/Makefile +++ b/usr.bin/lessecho/Makefile @@ -4,5 +4,5 @@ PROG= lessecho SRCS= lessecho.c version.c CLEANFILES= lessecho.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile index b10bf6d5fa2b..22bbf9377ea8 100644 --- a/usr.bin/lesskey/Makefile +++ b/usr.bin/lesskey/Makefile @@ -4,5 +4,5 @@ PROG= lesskey SRCS= lesskey.c version.c CLEANFILES= lesskey.1 -.include "${.CURDIR}/../less/Makefile.common" +.include "${SRCTOP}/usr.bin/less/Makefile.common" .include diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index faa503a1ec8a..86784c16f1b9 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -14,7 +14,7 @@ LINKS+= ${BINDIR}/lex ${BINDIR}/lex++ LINKS+= ${BINDIR}/lex ${BINDIR}/flex LINKS+= ${BINDIR}/lex ${BINDIR}/flex++ -FLEXDIR= ${.CURDIR}/../../contrib/flex +FLEXDIR= ${SRCTOP}/contrib/flex .PATH: ${FLEXDIR} diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index 4c28593aada9..0bca11f2113e 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -2,7 +2,7 @@ .include -.PATH: ${.CURDIR}/../../../contrib/flex +.PATH: ${SRCTOP}/contrib/flex LIB= ln SRCS= libmain.c libyywrap.c diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile index 1ca2f1078745..81395ec88137 100644 --- a/usr.bin/locale/Makefile +++ b/usr.bin/locale/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= locale -CFLAGS+= -I${.CURDIR}/../../lib/libc/locale +CFLAGS+= -I${SRCTOP}/lib/libc/locale .include diff --git a/usr.bin/localedef/Makefile b/usr.bin/localedef/Makefile index 8ce5c4aa592d..db1d2f92f90c 100644 --- a/usr.bin/localedef/Makefile +++ b/usr.bin/localedef/Makefile @@ -20,7 +20,7 @@ parser.h: parser.y 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 diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile index 158a2093be3a..3287bcf3ebd1 100644 --- a/usr.bin/lzmainfo/Makefile +++ b/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 diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile index 55118773b579..b5f4b304096f 100644 --- a/usr.bin/m4/Makefile +++ b/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= diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index 80951a6440a2..eaafb15b0754 100644 --- a/usr.bin/mandoc/Makefile +++ b/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 @@ SRCS= ${LIB_SRCS} \ WARNS?= 3 CFLAGS+= -DHAVE_CONFIG_H \ - -I${.CURDIR}/../../lib/libopenbsd/ + -I${SRCTOP}/lib/libopenbsd/ LIBADD= openbsd z .include diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile index 00a032841a16..2385f7655351 100644 --- a/usr.bin/minigzip/Makefile +++ b/usr.bin/minigzip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SRCDIR= ${.CURDIR}/../../contrib/zlib/test +SRCDIR= ${SRCTOP}/contrib/zlib/test .PATH: ${SRCDIR} PROG= minigzip diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile index 6dbb0ecbfff1..5d5e8b560bbf 100644 --- a/usr.bin/mkcsmapper/Makefile +++ b/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= diff --git a/usr.bin/mkcsmapper/Makefile.inc b/usr.bin/mkcsmapper/Makefile.inc index 5a4cc6faa5ab..1c744a7bb921 100644 --- a/usr.bin/mkcsmapper/Makefile.inc +++ b/usr.bin/mkcsmapper/Makefile.inc @@ -3,7 +3,7 @@ .include SRCS+= lex.l yacc.y -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkcsmapper \ - -I${.CURDIR}/../../lib/libc/iconv \ - -I${.CURDIR}/../../lib/libiconv_modules/mapper_std +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/usr.bin/mkcsmapper \ + -I${SRCTOP}/lib/libc/iconv \ + -I${SRCTOP}/lib/libiconv_modules/mapper_std CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile index a416b20645db..ca687224b495 100644 --- a/usr.bin/mkcsmapper_static/Makefile +++ b/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 @@ NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkcsmapper_static -.include "${.CURDIR}/../mkcsmapper/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkcsmapper/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile index b9495edf7d84..d49ecfa88f63 100644 --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/iconv +.PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile index 9ce020920808..0f7ad41bb98d 100644 --- a/usr.bin/mkesdb_static/Makefile +++ b/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 @@ NO_WMISSING_VARIABLE_DECLARATIONS= build-tools: mkesdb_static -.include "${.CURDIR}/../mkesdb/Makefile.inc" +.include "${SRCTOP}/usr.bin/mkesdb/Makefile.inc" .include ${PROG}: ${BUILD_TOOLS_META} diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile index 83850c44d81b..119dbc76e9e8 100644 --- a/usr.bin/mklocale/Makefile +++ b/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= diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile index b24a086af97d..74f9d62a25fa 100644 --- a/usr.bin/nc/Makefile +++ b/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 diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile index f386be2bf628..3ed6cccb7035 100644 --- a/usr.bin/opieinfo/Makefile +++ b/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 diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile index 95ae8b3e36f9..62bac07640ff 100644 --- a/usr.bin/opiekey/Makefile +++ b/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 diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile index 7b3f1f24bf95..f75b9f366d77 100644 --- a/usr.bin/opiepasswd/Makefile +++ b/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 diff --git a/usr.bin/pamtest/Makefile b/usr.bin/pamtest/Makefile index 289beb64ea82..8ca0f0c8a76f 100644 --- a/usr.bin/pamtest/Makefile +++ b/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 diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile index 8f7dec5695a8..238a901197d7 100644 --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -14,7 +14,7 @@ CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/common # 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. # diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile index 66638ccf04a9..6883c7dcbb13 100644 --- a/usr.bin/rsh/Makefile +++ b/usr.bin/rsh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= rsh -CFLAGS+=-I${.CURDIR}/../../libexec/rlogind +CFLAGS+=-I${SRCTOP}/libexec/rlogind PACKAGE=rcmds diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile index 2012124c29e2..7af710ac798d 100644 --- a/usr.bin/smbutil/Makefile +++ b/usr.bin/smbutil/Makefile @@ -5,7 +5,7 @@ SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c LIBADD= smb -CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs +CONTRIBDIR= ${SRCTOP}/contrib/smbfs CFLAGS+= -I${CONTRIBDIR}/include WARNS?= 0 diff --git a/usr.bin/svn/lib/Makefile.inc b/usr.bin/svn/lib/Makefile.inc index 74a455c09918..869da97afcbe 100644 --- a/usr.bin/svn/lib/Makefile.inc +++ b/usr.bin/svn/lib/Makefile.inc @@ -2,11 +2,11 @@ .if !defined(SVNDIR) -SVNDIR= ${.CURDIR}/../../../../contrib/subversion/subversion -APRU= ${.CURDIR}/../../../../contrib/apr-util -APR= ${.CURDIR}/../../../../contrib/apr -SQLITE= ${.CURDIR}/../../../../contrib/sqlite3 -SERF= ${.CURDIR}/../../../../contrib/serf +SVNDIR= ${SRCTOP}/contrib/subversion/subversion +APRU= ${SRCTOP}/contrib/apr-util +APR= ${SRCTOP}/contrib/apr +SQLITE= ${SRCTOP}/contrib/sqlite3 +SERF= ${SRCTOP}/contrib/serf WARNS?= 0 # definitely not ready diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index fbc0e98786c6..4832314b75b4 100644 --- a/usr.bin/tar/Makefile +++ b/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 @@ CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const .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 diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index a24a9669fb55..28a793be1ae6 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -2,7 +2,7 @@ .include -TELNETDIR= ${.CURDIR}/../../contrib/telnet +TELNETDIR= ${SRCTOP}/contrib/telnet .PATH: ${TELNETDIR}/telnet PROG= telnet diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index 0f96d232c0e1..b6ad018e03ac 100644 --- a/usr.bin/tftp/Makefile +++ b/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 diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index 9e62b4fa6eac..9ec95dccc0ad 100644 --- a/usr.bin/top/Makefile +++ b/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 @@ CFLAGS+= -D"Table_size=${TOP_TABLE_SIZE}" 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} diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile index d077eda07cf3..27881fa08966 100644 --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -6,8 +6,8 @@ SRCS= main.c setup.c syscalls.c 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 diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile index 59528ef3e0a4..095514f7acbe 100644 --- a/usr.bin/unvis/Makefile +++ b/usr.bin/unvis/Makefile @@ -3,6 +3,6 @@ PROG= unvis -.PATH: ${.CURDIR}/../../contrib/unvis +.PATH: ${SRCTOP}/contrib/unvis .include diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index aa8e9bd47917..ae3372f46fcd 100644 --- a/usr.bin/vacation/Makefile +++ b/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 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index ae9814d73951..43fc40ae0f72 100644 --- a/usr.bin/vi/Makefile +++ b/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 diff --git a/usr.bin/vis/Makefile b/usr.bin/vis/Makefile index 5d860defcde6..63aa832c99f4 100644 --- a/usr.bin/vis/Makefile +++ b/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 diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile index c14f84a260d5..70a5c93983aa 100644 --- a/usr.bin/w/Makefile +++ b/usr.bin/w/Makefile @@ -7,6 +7,6 @@ MAN= w.1 uptime.1 LIBADD= kvm sbuf xo util LINKS= ${BINDIR}/w ${BINDIR}/uptime -.PATH: ${.CURDIR}/../../bin/ps +.PATH: ${SRCTOP}/bin/ps .include diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index dcb486bdf8ec..2e167a75f2da 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -8,9 +8,9 @@ PROGNAME= install 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 diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile index 789417446cc0..f7687116c8fd 100644 --- a/usr.bin/xz/Makefile +++ b/usr.bin/xz/Makefile @@ -10,8 +10,8 @@ LINKS+= ${BINDIR}/xz ${BINDIR}/lzcat 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 diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile index f78a16c93905..538494c38ce6 100644 --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -6,8 +6,8 @@ LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec 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 diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index c110f3f59024..61b0e86fcc48 100644 --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -3,7 +3,7 @@ .include -BYACC_SRC= ${.CURDIR}/../../contrib/byacc +BYACC_SRC= ${SRCTOP}/contrib/byacc .PATH: ${BYACC_SRC} PROG= yacc diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile index 15dc9f85cb04..0cc473d2d80e 100644 --- a/usr.bin/ypwhich/Makefile +++ b/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