svn commit: r319186 - in stable/11/usr.bin: bsdiff/bsdiff bzip2 bzip2recover chkey chpass compile_et cpio ctlstat drill ee elfcopy factor file ftp host ipcrm iscsictl kdump less lessecho lesskey le...
Ngie Cooper
ngie at FreeBSD.org
Tue May 30 04:27:13 UTC 2017
Author: ngie
Date: Tue May 30 04:27:05 2017
New Revision: 319186
URL: https://svnweb.freebsd.org/changeset/base/319186
Log:
MFC r315170:
r315170 (by imp):
Adopt SRCTOP in usr.bin
Prefer ${SRCTOP}/foo over ${.CURDIR}/../../foo and ${SRCTOP}/usr.bin/foo
over ${.CURDIR}/../foo for paths in Makefiles.
Silence on: arch@ (twice)
Modified:
stable/11/usr.bin/bsdiff/bsdiff/Makefile
stable/11/usr.bin/bzip2/Makefile
stable/11/usr.bin/bzip2recover/Makefile
stable/11/usr.bin/chkey/Makefile
stable/11/usr.bin/chpass/Makefile
stable/11/usr.bin/compile_et/Makefile
stable/11/usr.bin/cpio/Makefile
stable/11/usr.bin/ctlstat/Makefile
stable/11/usr.bin/drill/Makefile
stable/11/usr.bin/ee/Makefile
stable/11/usr.bin/elfcopy/Makefile
stable/11/usr.bin/factor/Makefile
stable/11/usr.bin/file/Makefile
stable/11/usr.bin/ftp/Makefile
stable/11/usr.bin/host/Makefile
stable/11/usr.bin/ipcrm/Makefile
stable/11/usr.bin/iscsictl/Makefile
stable/11/usr.bin/kdump/Makefile
stable/11/usr.bin/less/Makefile.common
stable/11/usr.bin/lessecho/Makefile
stable/11/usr.bin/lesskey/Makefile
stable/11/usr.bin/lex/Makefile
stable/11/usr.bin/lex/lib/Makefile
stable/11/usr.bin/locale/Makefile
stable/11/usr.bin/localedef/Makefile
stable/11/usr.bin/lzmainfo/Makefile
stable/11/usr.bin/m4/Makefile
stable/11/usr.bin/mandoc/Makefile
stable/11/usr.bin/minigzip/Makefile
stable/11/usr.bin/mkcsmapper/Makefile
stable/11/usr.bin/mkcsmapper/Makefile.inc
stable/11/usr.bin/mkcsmapper_static/Makefile
stable/11/usr.bin/mkesdb/Makefile
stable/11/usr.bin/mkesdb_static/Makefile
stable/11/usr.bin/mklocale/Makefile
stable/11/usr.bin/nc/Makefile
stable/11/usr.bin/opieinfo/Makefile
stable/11/usr.bin/opiekey/Makefile
stable/11/usr.bin/opiepasswd/Makefile
stable/11/usr.bin/pamtest/Makefile
stable/11/usr.bin/readelf/Makefile
stable/11/usr.bin/rsh/Makefile
stable/11/usr.bin/smbutil/Makefile
stable/11/usr.bin/svn/lib/Makefile.inc
stable/11/usr.bin/tar/Makefile
stable/11/usr.bin/telnet/Makefile
stable/11/usr.bin/tftp/Makefile
stable/11/usr.bin/top/Makefile
stable/11/usr.bin/truss/Makefile
stable/11/usr.bin/unvis/Makefile
stable/11/usr.bin/vacation/Makefile
stable/11/usr.bin/vi/Makefile
stable/11/usr.bin/vis/Makefile
stable/11/usr.bin/w/Makefile
stable/11/usr.bin/xinstall/Makefile
stable/11/usr.bin/xz/Makefile
stable/11/usr.bin/xzdec/Makefile
stable/11/usr.bin/yacc/Makefile
stable/11/usr.bin/ypwhich/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.bin/bsdiff/bsdiff/Makefile
==============================================================================
--- stable/11/usr.bin/bsdiff/bsdiff/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/bsdiff/bsdiff/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/bzip2/Makefile
==============================================================================
--- stable/11/usr.bin/bzip2/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/bzip2/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-BZ2DIR= ${.CURDIR}/../../contrib/bzip2
+BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2
Modified: stable/11/usr.bin/bzip2recover/Makefile
==============================================================================
--- stable/11/usr.bin/bzip2recover/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/bzip2recover/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-BZ2DIR= ${.CURDIR}/../../contrib/bzip2
+BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2recover
Modified: stable/11/usr.bin/chkey/Makefile
==============================================================================
--- stable/11/usr.bin/chkey/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/chkey/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/chpass/Makefile
==============================================================================
--- stable/11/usr.bin/chpass/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/chpass/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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"
Modified: stable/11/usr.bin/compile_et/Makefile
==============================================================================
--- stable/11/usr.bin/compile_et/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/compile_et/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/cpio/Makefile
==============================================================================
--- stable/11/usr.bin/cpio/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/cpio/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/ctlstat/Makefile
==============================================================================
--- stable/11/usr.bin/ctlstat/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/ctlstat/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -2,7 +2,7 @@
PROG= ctlstat
MAN= ctlstat.8
-SDIR= ${.CURDIR}/../../sys
+SDIR= ${SRCTOP}/sys
CFLAGS+= -I${SDIR}
.include <bsd.prog.mk>
Modified: stable/11/usr.bin/drill/Makefile
==============================================================================
--- stable/11/usr.bin/drill/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/drill/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,7 +1,7 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../contrib/ldns
+LDNSDIR= ${SRCTOP}/contrib/ldns
.PATH: ${LDNSDIR}/drill
Modified: stable/11/usr.bin/ee/Makefile
==============================================================================
--- stable/11/usr.bin/ee/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/ee/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/elfcopy/Makefile
==============================================================================
--- stable/11/usr.bin/elfcopy/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/elfcopy/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -32,7 +32,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.
#
Modified: stable/11/usr.bin/factor/Makefile
==============================================================================
--- stable/11/usr.bin/factor/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/factor/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/file/Makefile
==============================================================================
--- stable/11/usr.bin/file/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/file/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/ftp/Makefile
==============================================================================
--- stable/11/usr.bin/ftp/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/ftp/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/host/Makefile
==============================================================================
--- stable/11/usr.bin/host/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/host/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/ipcrm/Makefile
==============================================================================
--- stable/11/usr.bin/ipcrm/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/ipcrm/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/iscsictl/Makefile
==============================================================================
--- stable/11/usr.bin/iscsictl/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/iscsictl/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/kdump/Makefile
==============================================================================
--- stable/11/usr.bin/kdump/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/kdump/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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"
Modified: stable/11/usr.bin/less/Makefile.common
==============================================================================
--- stable/11/usr.bin/less/Makefile.common Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/less/Makefile.common Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/lessecho/Makefile
==============================================================================
--- stable/11/usr.bin/lessecho/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/lessecho/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/lesskey/Makefile
==============================================================================
--- stable/11/usr.bin/lesskey/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/lesskey/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/lex/Makefile
==============================================================================
--- stable/11/usr.bin/lex/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/lex/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/lex/lib/Makefile
==============================================================================
--- stable/11/usr.bin/lex/lib/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/lex/lib/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/flex
+.PATH: ${SRCTOP}/contrib/flex
LIB= ln
SRCS= libmain.c libyywrap.c
Modified: stable/11/usr.bin/locale/Makefile
==============================================================================
--- stable/11/usr.bin/locale/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/locale/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= locale
-CFLAGS+= -I${.CURDIR}/../../lib/libc/locale
+CFLAGS+= -I${SRCTOP}/lib/libc/locale
.include <bsd.prog.mk>
Modified: stable/11/usr.bin/localedef/Makefile
==============================================================================
--- stable/11/usr.bin/localedef/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/localedef/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/lzmainfo/Makefile
==============================================================================
--- stable/11/usr.bin/lzmainfo/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/lzmainfo/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/m4/Makefile
==============================================================================
--- stable/11/usr.bin/m4/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/m4/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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=
Modified: stable/11/usr.bin/mandoc/Makefile
==============================================================================
--- stable/11/usr.bin/mandoc/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mandoc/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-MDOCMLDIR= ${.CURDIR}/../../contrib/mdocml
+MDOCMLDIR= ${SRCTOP}/contrib/mdocml
.PATH: ${MDOCMLDIR}
PROG= mandoc
@@ -90,7 +90,7 @@ SRCS= ${LIB_SRCS} \
WARNS?= 3
CFLAGS+= -DHAVE_CONFIG_H \
-D_WITH_GETLINE \
- -I${.CURDIR}/../../lib/libopenbsd/
+ -I${SRCTOP}/lib/libopenbsd/
LIBADD= openbsd z
.include <bsd.prog.mk>
Modified: stable/11/usr.bin/minigzip/Makefile
==============================================================================
--- stable/11/usr.bin/minigzip/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/minigzip/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR= ${.CURDIR}/../../contrib/zlib/test
+SRCDIR= ${SRCTOP}/contrib/zlib/test
.PATH: ${SRCDIR}
PROG= minigzip
Modified: stable/11/usr.bin/mkcsmapper/Makefile
==============================================================================
--- stable/11/usr.bin/mkcsmapper/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mkcsmapper/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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=
Modified: stable/11/usr.bin/mkcsmapper/Makefile.inc
==============================================================================
--- stable/11/usr.bin/mkcsmapper/Makefile.inc Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mkcsmapper/Makefile.inc Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/mkcsmapper_static/Makefile
==============================================================================
--- stable/11/usr.bin/mkcsmapper_static/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mkcsmapper_static/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/mkesdb/Makefile
==============================================================================
--- stable/11/usr.bin/mkesdb/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mkesdb/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../lib/libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
PROG= mkesdb
Modified: stable/11/usr.bin/mkesdb_static/Makefile
==============================================================================
--- stable/11/usr.bin/mkesdb_static/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mkesdb_static/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/mklocale/Makefile
==============================================================================
--- stable/11/usr.bin/mklocale/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/mklocale/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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=
Modified: stable/11/usr.bin/nc/Makefile
==============================================================================
--- stable/11/usr.bin/nc/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/nc/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../contrib/netcat
+.PATH: ${SRCTOP}/contrib/netcat
PROG= nc
SRCS= netcat.c atomicio.c socks.c
Modified: stable/11/usr.bin/opieinfo/Makefile
==============================================================================
--- stable/11/usr.bin/opieinfo/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/opieinfo/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/opiekey/Makefile
==============================================================================
--- stable/11/usr.bin/opiekey/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/opiekey/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/opiepasswd/Makefile
==============================================================================
--- stable/11/usr.bin/opiepasswd/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/opiepasswd/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/pamtest/Makefile
==============================================================================
--- stable/11/usr.bin/pamtest/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/pamtest/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-OPENPAM= ${.CURDIR}/../../contrib/openpam
+OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest
PROG= pamtest
Modified: stable/11/usr.bin/readelf/Makefile
==============================================================================
--- stable/11/usr.bin/readelf/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/readelf/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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.
#
Modified: stable/11/usr.bin/rsh/Makefile
==============================================================================
--- stable/11/usr.bin/rsh/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/rsh/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= rsh
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
+CFLAGS+=-I${SRCTOP}/libexec/rlogind
PACKAGE=rcmds
Modified: stable/11/usr.bin/smbutil/Makefile
==============================================================================
--- stable/11/usr.bin/smbutil/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/smbutil/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -5,7 +5,7 @@ SRCS= smbutil.c dumptree.c login.c lookup.c view.c pri
LIBADD= smb
-CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR= ${SRCTOP}/contrib/smbfs
CFLAGS+= -I${CONTRIBDIR}/include
WARNS?= 0
Modified: stable/11/usr.bin/svn/lib/Makefile.inc
==============================================================================
--- stable/11/usr.bin/svn/lib/Makefile.inc Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/svn/lib/Makefile.inc Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/tar/Makefile
==============================================================================
--- stable/11/usr.bin/tar/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/tar/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
.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
Modified: stable/11/usr.bin/telnet/Makefile
==============================================================================
--- stable/11/usr.bin/telnet/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/telnet/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-TELNETDIR= ${.CURDIR}/../../contrib/telnet
+TELNETDIR= ${SRCTOP}/contrib/telnet
.PATH: ${TELNETDIR}/telnet
PROG= telnet
Modified: stable/11/usr.bin/tftp/Makefile
==============================================================================
--- stable/11/usr.bin/tftp/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/tftp/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/top/Makefile
==============================================================================
--- stable/11/usr.bin/top/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/top/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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}
Modified: stable/11/usr.bin/truss/Makefile
==============================================================================
--- stable/11/usr.bin/truss/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/truss/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/unvis/Makefile
==============================================================================
--- stable/11/usr.bin/unvis/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/unvis/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -3,6 +3,6 @@
PROG= unvis
-.PATH: ${.CURDIR}/../../contrib/unvis
+.PATH: ${SRCTOP}/contrib/unvis
.include <bsd.prog.mk>
Modified: stable/11/usr.bin/vacation/Makefile
==============================================================================
--- stable/11/usr.bin/vacation/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/vacation/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/vacation
PROG= vacation
Modified: stable/11/usr.bin/vi/Makefile
==============================================================================
--- stable/11/usr.bin/vi/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/vi/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/vis/Makefile
==============================================================================
--- stable/11/usr.bin/vis/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/vis/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/w/Makefile
==============================================================================
--- stable/11/usr.bin/w/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/w/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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>
Modified: stable/11/usr.bin/xinstall/Makefile
==============================================================================
--- stable/11/usr.bin/xinstall/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/xinstall/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/xz/Makefile
==============================================================================
--- stable/11/usr.bin/xz/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/xz/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/xzdec/Makefile
==============================================================================
--- stable/11/usr.bin/xzdec/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/xzdec/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
Modified: stable/11/usr.bin/yacc/Makefile
==============================================================================
--- stable/11/usr.bin/yacc/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/yacc/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
-BYACC_SRC= ${.CURDIR}/../../contrib/byacc
+BYACC_SRC= ${SRCTOP}/contrib/byacc
.PATH: ${BYACC_SRC}
PROG= yacc
Modified: stable/11/usr.bin/ypwhich/Makefile
==============================================================================
--- stable/11/usr.bin/ypwhich/Makefile Tue May 30 04:17:22 2017 (r319185)
+++ stable/11/usr.bin/ypwhich/Makefile Tue May 30 04:27:05 2017 (r319186)
@@ -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
More information about the svn-src-stable-11
mailing list