d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adopt SRCTOP in usr.bin

Browse Source 
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)
This commit is contained in:
Warner Losh 2017-03-12 18:58:44 +00:00
parent e3f87f6c70
commit a35f04fba2
59 changed files with 96 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/bsdiff/bsdiff/Makefile
View File

@ -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

2
usr.bin/bzip2/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
BZ2DIR= ${.CURDIR}/../../contrib/bzip2
BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2

2
usr.bin/bzip2recover/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
BZ2DIR= ${.CURDIR}/../../contrib/bzip2
BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2recover

4
usr.bin/chkey/Makefile
View File

@ -2,11 +2,11 @@
.include <src.opts.mk>
.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

4
usr.bin/chpass/Makefile
View File

@ -3,7 +3,7 @@
.include <src.opts.mk>
.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"

4
usr.bin/compile_et/Makefile
View File

@ -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

4
usr.bin/cpio/Makefile
View File

@ -2,8 +2,8 @@
.include <src.opts.mk>
_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
_LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive
_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
_LIBARCHIVECONFDIR= ${SRCTOP}/lib/libarchive
PROG= bsdcpio
BSDCPIO_VERSION_STRING= 3.3.1

2
usr.bin/ctlstat/Makefile
View File

@ -2,7 +2,7 @@
PROG= ctlstat
MAN= ctlstat.8
SDIR= ${.CURDIR}/../../sys
SDIR= ${SRCTOP}/sys
CFLAGS+= -I${SDIR}
.include <bsd.prog.mk>

2
usr.bin/drill/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
# Vendor sources and generated files
LDNSDIR= ${.CURDIR}/../../contrib/ldns
LDNSDIR= ${SRCTOP}/contrib/ldns
.PATH: ${LDNSDIR}/drill

4
usr.bin/ee/Makefile
View File

@ -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

2
usr.bin/elfcopy/Makefile
View File

@ -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.
#

4
usr.bin/factor/Makefile
View File

@ -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 <bsd.prog.mk>

6
usr.bin/file/Makefile
View File

@ -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}

2
usr.bin/ftp/Makefile
View File

@ -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

4
usr.bin/host/Makefile
View File

@ -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}

4
usr.bin/ipcrm/Makefile
View File

@ -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

2
usr.bin/iscsictl/Makefile
View File

@ -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

4
usr.bin/kdump/Makefile
View File

@ -3,11 +3,11 @@
.include <src.opts.mk>
.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"

4
usr.bin/less/Makefile.common
View File

@ -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

2
usr.bin/lessecho/Makefile
View File

@ -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 <bsd.prog.mk>

2
usr.bin/lesskey/Makefile
View File

@ -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 <bsd.prog.mk>

2
usr.bin/lex/Makefile
View File

@ -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}

2
usr.bin/lex/lib/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
.PATH: ${.CURDIR}/../../../contrib/flex
.PATH: ${SRCTOP}/contrib/flex
LIB= ln
SRCS= libmain.c libyywrap.c

2
usr.bin/locale/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
PROG= locale
CFLAGS+= -I${.CURDIR}/../../lib/libc/locale
CFLAGS+= -I${SRCTOP}/lib/libc/locale
.include <bsd.prog.mk>

4
usr.bin/localedef/Makefile
View File

@ -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 <bsd.prog.mk>

4
usr.bin/lzmainfo/Makefile
View File

@ -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

2
usr.bin/m4/Makefile
View File

@ -7,7 +7,7 @@
.include <src.opts.mk>
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=

4
usr.bin/mandoc/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
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 <bsd.prog.mk>

2
usr.bin/minigzip/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SRCDIR= ${.CURDIR}/../../contrib/zlib/test
SRCDIR= ${SRCTOP}/contrib/zlib/test
.PATH: ${SRCDIR}
PROG= minigzip

4
usr.bin/mkcsmapper/Makefile
View File

@ -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=

6
usr.bin/mkcsmapper/Makefile.inc
View File

@ -3,7 +3,7 @@
.include <bsd.compiler.mk>
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

4
usr.bin/mkcsmapper_static/Makefile
View File

@ -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 <bsd.prog.mk>
${PROG}: ${BUILD_TOOLS_META}

2
usr.bin/mkesdb/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../lib/libc/iconv
.PATH: ${SRCTOP}/lib/libc/iconv
PROG= mkesdb

4
usr.bin/mkesdb_static/Makefile
View File

@ -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 <bsd.prog.mk>
${PROG}: ${BUILD_TOOLS_META}

2
usr.bin/mklocale/Makefile
View File

@ -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=

2
usr.bin/nc/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/netcat
.PATH: ${SRCTOP}/contrib/netcat
PROG= nc
SRCS= netcat.c atomicio.c socks.c

4
usr.bin/opieinfo/Makefile
View File

@ -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

4
usr.bin/opiekey/Makefile
View File

@ -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

4
usr.bin/opiepasswd/Makefile
View File

@ -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

2
usr.bin/pamtest/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
OPENPAM= ${.CURDIR}/../../contrib/openpam
OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest
PROG= pamtest

2
usr.bin/readelf/Makefile
View File

@ -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.
#

2
usr.bin/rsh/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= rsh
CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
CFLAGS+=-I${SRCTOP}/libexec/rlogind
PACKAGE=rcmds

2
usr.bin/smbutil/Makefile
View File

@ -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

10
usr.bin/svn/lib/Makefile.inc
View File

@ -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

4
usr.bin/tar/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
_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

2
usr.bin/telnet/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk>
TELNETDIR= ${.CURDIR}/../../contrib/telnet
TELNETDIR= ${SRCTOP}/contrib/telnet
.PATH: ${TELNETDIR}/telnet
PROG= telnet

4
usr.bin/tftp/Makefile
View File

@ -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

4
usr.bin/top/Makefile
View File

@ -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}

4
usr.bin/truss/Makefile
View File

@ -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

2
usr.bin/unvis/Makefile
View File

@ -3,6 +3,6 @@
PROG= unvis
.PATH: ${.CURDIR}/../../contrib/unvis
.PATH: ${SRCTOP}/contrib/unvis
.include <bsd.prog.mk>

2
usr.bin/vacation/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/vacation
PROG= vacation

2
usr.bin/vi/Makefile
View File

@ -5,7 +5,7 @@
.include <src.opts.mk>
PACKAGE= vi
SRCDIR= ${.CURDIR}/../../contrib/nvi
SRCDIR= ${SRCTOP}/contrib/nvi
SUBDIR+= catalog
WARNS?= 0 # some warn issues on 32 bit machines

4
usr.bin/vis/Makefile
View File

@ -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 <bsd.prog.mk>

2
usr.bin/w/Makefile
View File

@ -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 <bsd.prog.mk>

6
usr.bin/xinstall/Makefile
View File

@ -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

4
usr.bin/xz/Makefile
View File

@ -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

4
usr.bin/xzdec/Makefile
View File

@ -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

2
usr.bin/yacc/Makefile
View File

@ -3,7 +3,7 @@
.include <src.opts.mk>
BYACC_SRC= ${.CURDIR}/../../contrib/byacc
BYACC_SRC= ${SRCTOP}/contrib/byacc
.PATH: ${BYACC_SRC}
PROG= yacc

2
usr.bin/ypwhich/Makefile
View File

@ -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