Author: ngie
Date: Fri Feb 10 07:32:40 2017
New Revision: 313538
URL: https://svnweb.freebsd.org/changeset/base/313538
Log:
MFC r312452-r312512:
r312452-r312512:
- Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output
- Use .CURDIR:H instead of .CURDIR to simplify pathing in output, etc
Modified:
stable/11/lib/csu/aarch64/Makefile
stable/11/lib/csu/amd64/Makefile
stable/11/lib/csu/arm/Makefile
stable/11/lib/csu/i386/Makefile
stable/11/lib/csu/mips/Makefile
stable/11/lib/csu/powerpc/Makefile
stable/11/lib/csu/powerpc64/Makefile
stable/11/lib/csu/riscv/Makefile
stable/11/lib/csu/sparc64/Makefile
stable/11/lib/libalias/libalias/Makefile
stable/11/lib/libalias/modules/Makefile
stable/11/lib/libalias/modules/Makefile.inc
stable/11/lib/libarchive/Makefile
stable/11/lib/libauditd/Makefile
stable/11/lib/libbegemot/Makefile
stable/11/lib/libblocksruntime/Makefile
stable/11/lib/libbluetooth/Makefile
stable/11/lib/libbsm/Makefile
stable/11/lib/libbsnmp/libbsnmp/Makefile
stable/11/lib/libbz2/Makefile
stable/11/lib/libc++/Makefile
stable/11/lib/libc_nonshared/Makefile
stable/11/lib/libcam/Makefile
stable/11/lib/libcom_err/Makefile
stable/11/lib/libcompat/Makefile
stable/11/lib/libcrypt/Makefile
stable/11/lib/libcxxrt/Makefile
stable/11/lib/libdevdctl/tests/Makefile
stable/11/lib/libdwarf/Makefile
stable/11/lib/libelf/Makefile
stable/11/lib/libevent/Makefile
stable/11/lib/libexecinfo/Makefile
stable/11/lib/libexpat/Makefile
stable/11/lib/libgssapi/Makefile
stable/11/lib/libiconv_modules/Makefile.inc
stable/11/lib/libiconv_modules/mapper_parallel/Makefile
stable/11/lib/libkiconv/Makefile
stable/11/lib/libldns/Makefile
stable/11/lib/liblzma/Makefile
stable/11/lib/libmagic/Makefile
stable/11/lib/libmd/Makefile
stable/11/lib/libmilter/Makefile
stable/11/lib/libmp/Makefile
stable/11/lib/libngatm/Makefile
stable/11/lib/libnv/Makefile
stable/11/lib/libopie/Makefile
stable/11/lib/libpam/libpam/Makefile
stable/11/lib/libpam/modules/Makefile.inc
stable/11/lib/libpam/modules/pam_passwdqc/Makefile
stable/11/lib/libpam/modules/pam_ssh/Makefile
stable/11/lib/libpam/static_libpam/Makefile
stable/11/lib/libpcap/Makefile
stable/11/lib/libpe/Makefile
stable/11/lib/libproc/Makefile
stable/11/lib/libprocstat/zfs/Makefile
stable/11/lib/librpcsec_gss/Makefile
stable/11/lib/librpcsvc/Makefile
stable/11/lib/librt/Makefile
stable/11/lib/libsbuf/Makefile
stable/11/lib/libsm/Makefile
stable/11/lib/libsmb/Makefile
stable/11/lib/libsmdb/Makefile
stable/11/lib/libsmutil/Makefile
stable/11/lib/libsqlite3/Makefile
stable/11/lib/libstdthreads/Makefile
stable/11/lib/libsysdecode/Makefile
stable/11/lib/libtelnet/Makefile
stable/11/lib/libthr/Makefile
stable/11/lib/libthr/support/Makefile.inc
stable/11/lib/libthread_db/Makefile
stable/11/lib/libufs/Makefile
stable/11/lib/libulog/Makefile
stable/11/lib/libunbound/Makefile
stable/11/lib/libutil/Makefile
stable/11/lib/libypclnt/Makefile
stable/11/lib/ncurses/config.mk
stable/11/lib/ncurses/form/Makefile
stable/11/lib/ncurses/formw/Makefile
stable/11/lib/ncurses/menu/Makefile
stable/11/lib/ncurses/menuw/Makefile
stable/11/lib/ncurses/ncurses/Makefile
stable/11/lib/ncurses/ncursesw/Makefile
stable/11/lib/ncurses/panel/Makefile
stable/11/lib/ncurses/panelw/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/lib/csu/aarch64/Makefile
==============================================================================
--- stable/11/lib/csu/aarch64/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/aarch64/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/csu/amd64/Makefile
==============================================================================
--- stable/11/lib/csu/amd64/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/amd64/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
CFLAGS+= -fno-omit-frame-pointer
FILES= ${OBJS}
Modified: stable/11/lib/csu/arm/Makefile
==============================================================================
--- stable/11/lib/csu/arm/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/arm/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
STATIC_CFLAGS+= -mlong-calls
FILES= ${OBJS}
Modified: stable/11/lib/csu/i386/Makefile
==============================================================================
--- stable/11/lib/csu/i386/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/i386/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= gcrt1.o crt1.o Scrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/csu/mips/Makefile
==============================================================================
--- stable/11/lib/csu/mips/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/mips/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/csu/powerpc/Makefile
==============================================================================
--- stable/11/lib/csu/powerpc/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/powerpc/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/csu/powerpc64/Makefile
==============================================================================
--- stable/11/lib/csu/powerpc64/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/powerpc64/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include \
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include \
-mlongcall
# XXX: See the log for r232932 as to why the above -mlongcall is needed. Since
Modified: stable/11/lib/csu/riscv/Makefile
==============================================================================
--- stable/11/lib/csu/riscv/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/riscv/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,12 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common \
- -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/csu/sparc64/Makefile
==============================================================================
--- stable/11/lib/csu/sparc64/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/csu/sparc64/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,11 +1,12 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../common
+.PATH: ${.CURDIR:H}/common
SRCS= crt1.c crti.S crtn.S
OBJS= ${SRCS:N*.h:R:S/$/.o/g}
OBJS+= Scrt1.o gcrt1.o
-CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include
+CFLAGS+= -I${.CURDIR:H}/common \
+ -I${SRCTOP}/lib/libc/include
FILES= ${OBJS}
FILESMODE= ${LIBMODE}
Modified: stable/11/lib/libalias/libalias/Makefile
==============================================================================
--- stable/11/lib/libalias/libalias/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libalias/libalias/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
PACKAGE=lib${LIB}
LIB= alias
Modified: stable/11/lib/libalias/modules/Makefile
==============================================================================
--- stable/11/lib/libalias/modules/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libalias/modules/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../../../sys/modules/libalias/modules/modules.inc"
+.include "${SRCTOP}/sys/modules/libalias/modules/modules.inc"
SUBDIR= ${MODULES}
Modified: stable/11/lib/libalias/modules/Makefile.inc
==============================================================================
--- stable/11/lib/libalias/modules/Makefile.inc Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libalias/modules/Makefile.inc Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../../sys/netinet/libalias
+.PATH: ${SRCTOP}/sys/netinet/libalias
SHLIBDIR?= /lib
LIB?= alias_${NAME}
Modified: stable/11/lib/libarchive/Makefile
==============================================================================
--- stable/11/lib/libarchive/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libarchive/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
PACKAGE=lib${LIB}
-_LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive
+_LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive
LIB= archive
Modified: stable/11/lib/libauditd/Makefile
==============================================================================
--- stable/11/lib/libauditd/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libauditd/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
#
PACKAGE=lib${LIB}
-OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR= ${SRCTOP}/contrib/openbsm
_LIBAUDITDDIR= ${OPENBSMDIR}/libauditd
_LIBBSMDIR= ${OPENBSMDIR}/libbsm
Modified: stable/11/lib/libbegemot/Makefile
==============================================================================
--- stable/11/lib/libbegemot/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libbegemot/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/libbegemot
+LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot
PACKAGE=lib${LIB}
.PATH: ${LIBBEGEMOT_DIR}
Modified: stable/11/lib/libblocksruntime/Makefile
==============================================================================
--- stable/11/lib/libblocksruntime/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libblocksruntime/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -6,7 +6,7 @@ SHLIB_MAJOR=0
CFLAGS+=-I${.CURDIR}
WARNS?= 2
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/BlocksRuntime
+.PATH: ${SRCTOP}/contrib/compiler-rt/lib/BlocksRuntime
INCS= Block.h Block_private.h
SRCS= data.c runtime.c
Modified: stable/11/lib/libbluetooth/Makefile
==============================================================================
--- stable/11/lib/libbluetooth/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libbluetooth/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -6,7 +6,7 @@ LIB= bluetooth
MAN= bluetooth.3
WARNS?= 2
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys
SHLIB_MAJOR= 4
Modified: stable/11/lib/libbsm/Makefile
==============================================================================
--- stable/11/lib/libbsm/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libbsm/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
#
PACKAGE= lib${LIB}
-OPENBSMDIR= ${.CURDIR}/../../contrib/openbsm
+OPENBSMDIR= ${SRCTOP}/contrib/openbsm
_LIBBSMDIR= ${OPENBSMDIR}/libbsm
LIB= bsm
Modified: stable/11/lib/libbsnmp/libbsnmp/Makefile
==============================================================================
--- stable/11/lib/libbsnmp/libbsnmp/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libbsnmp/libbsnmp/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -4,7 +4,7 @@
.include <src.opts.mk>
-CONTRIB= ${.CURDIR}/../../../contrib/bsnmp/lib
+CONTRIB= ${SRCTOP}/contrib/bsnmp/lib
.PATH: ${CONTRIB}
LIB= bsnmp
Modified: stable/11/lib/libbz2/Makefile
==============================================================================
--- stable/11/lib/libbz2/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libbz2/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE= lib${LIB}
-BZ2DIR= ${.CURDIR}/../../contrib/bzip2
+BZ2DIR= ${SRCTOP}/contrib/bzip2
.PATH: ${BZ2DIR}
LIB= bz2
Modified: stable/11/lib/libc++/Makefile
==============================================================================
--- stable/11/lib/libc++/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libc++/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,9 +3,9 @@
.include <src.opts.mk>
PACKAGE= clibs
-_LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt
-HDRDIR= ${.CURDIR}/../../contrib/libc++/include
-SRCDIR= ${.CURDIR}/../../contrib/libc++/src
+_LIBCXXRTDIR= ${SRCTOP}/contrib/libcxxrt
+HDRDIR= ${SRCTOP}/contrib/libc++/include
+SRCDIR= ${SRCTOP}/contrib/libc++/src
CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR}
.if ${MACHINE_CPUARCH} == "arm"
STATIC_CXXFLAGS+= -mlong-calls
Modified: stable/11/lib/libc_nonshared/Makefile
==============================================================================
--- stable/11/lib/libc_nonshared/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libc_nonshared/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -6,7 +6,7 @@
# bsd.lib.mk doesn't have an easy way to express that.
MK_PROFILE?=no
.include <src.opts.mk>
-NO_PIC=
+NO_PIC=
# -fpic on some platforms, -fPIC on others.
CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
@@ -18,9 +18,9 @@ LIBC_NONSHARED_SRCS=
SRCS= __stub.c
.if ${MK_ICONV} == "yes"
-.PATH: ${.CURDIR}/../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
.include "Makefile.iconv"
-CFLAGS+=-I${.CURDIR}/../libc/iconv
+CFLAGS+=-I${SRCTOP}/lib/libc/iconv
.endif
SRCS+= ${LIBC_NONSHARED_SRCS}
Modified: stable/11/lib/libcam/Makefile
==============================================================================
--- stable/11/lib/libcam/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libcam/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -36,11 +36,10 @@ MLINKS+= cam.3 cam_open_device.3 \
cam_cdbparse.3 csio_encode_visit.3 \
cam_cdbparse.3 buff_encode_visit.3
-.PATH: ${.CURDIR}/../../sys/cam/scsi ${.CURDIR}/../../sys/cam/ata \
- ${.CURDIR}/../../sys/cam
+.PATH: ${SRCTOP}/sys/cam/scsi ${SRCTOP}/sys/cam/ata \
+ ${SRCTOP}/sys/cam
-SDIR= ${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR} -I${SDIR}
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys
SHLIB_MAJOR= 7
Modified: stable/11/lib/libcom_err/Makefile
==============================================================================
--- stable/11/lib/libcom_err/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libcom_err/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -5,7 +5,7 @@ LIB= com_err
SRCS= com_err.c error.c
INCS= ${COM_ERRDIR}/com_err.h ${COM_ERRDIR}/com_right.h
MAN= com_err.3
-COM_ERRDIR= ${.CURDIR}/../../contrib/com_err
+COM_ERRDIR= ${SRCTOP}/contrib/com_err
CFLAGS+= -I${COM_ERRDIR}
LDFLAGS= -Wl,--no-undefined
Modified: stable/11/lib/libcompat/Makefile
==============================================================================
--- stable/11/lib/libcompat/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libcompat/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
PACKAGE=lib${LIB}
LIB= compat
-CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
+CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${SRCTOP}/lib/libc/locale
NO_PIC=
WARNS?= 0
Modified: stable/11/lib/libcrypt/Makefile
==============================================================================
--- stable/11/lib/libcrypt/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libcrypt/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -10,7 +10,7 @@ SHLIBDIR?= /lib
SHLIB_MAJOR= 5
LIB= crypt
-.PATH: ${.CURDIR}/../libmd ${.CURDIR}/../../sys/crypto/sha2
+.PATH: ${SRCTOP}/lib/libmd ${SRCTOP}/sys/crypto/sha2
SRCS= crypt.c misc.c \
crypt-md5.c md5c.c \
crypt-nthash.c md4c.c \
@@ -18,12 +18,12 @@ SRCS= crypt.c misc.c \
crypt-sha512.c sha512c.c
MAN= crypt.3
MLINKS= crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
-CFLAGS+= -I${.CURDIR}/../libmd -I${.CURDIR}/../libutil \
- -I${.CURDIR}/../../sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/lib/libmd -I${SRCTOP}/lib/libutil \
+ -I${SRCTOP}/sys/crypto/sha2
# Pull in the strong crypto, if it is present.
-.if exists(${.CURDIR}/../../secure/lib/libcrypt) && ${MK_CRYPT} != "no"
-.PATH: ${.CURDIR}/../../secure/lib/libcrypt
+.if exists(${SRCTOP}/secure/lib/libcrypt) && ${MK_CRYPT} != "no"
+.PATH: ${SRCTOP}/secure/lib/libcrypt
SRCS+= crypt-des.c crypt-blowfish.c blowfish.c
CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH
.endif
Modified: stable/11/lib/libcxxrt/Makefile
==============================================================================
--- stable/11/lib/libcxxrt/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libcxxrt/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE= clibs
-SRCDIR= ${.CURDIR}/../../contrib/libcxxrt
+SRCDIR= ${SRCTOP}/contrib/libcxxrt
SHLIB_MAJOR= 1
SHLIBDIR?= /lib
Modified: stable/11/lib/libdevdctl/tests/Makefile
==============================================================================
--- stable/11/lib/libdevdctl/tests/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libdevdctl/tests/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -2,7 +2,7 @@
TESTSDIR= ${TESTSBASE}/lib/libdevdctl
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
PLAIN_TESTS_CXX= libdevdctl_unittest
Modified: stable/11/lib/libdwarf/Makefile
==============================================================================
--- stable/11/lib/libdwarf/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libdwarf/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -94,7 +94,7 @@ CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common -I${ELFTCDIR}/libelf
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.TARGET}
Modified: stable/11/lib/libelf/Makefile
==============================================================================
--- stable/11/lib/libelf/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libelf/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -82,7 +82,7 @@ CLEANFILES= ${GENSRCS}
CLEANDIRS= sys
CFLAGS+= -I. -I${SRCDIR} -I${ELFTCDIR}/common
-sys/elf32.h sys/elf64.h sys/elf_common.h: ${.CURDIR}/../../sys/${.TARGET}
.NOMETA
+sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
mkdir -p ${.OBJDIR}/sys
ln -sf ${.ALLSRC} ${.TARGET}
Modified: stable/11/lib/libevent/Makefile
==============================================================================
--- stable/11/lib/libevent/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libevent/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-.PATH: ${.CURDIR}/../../contrib/pf/libevent
+.PATH: ${SRCTOP}/contrib/pf/libevent
.include <src.opts.mk>
Modified: stable/11/lib/libexecinfo/Makefile
==============================================================================
--- stable/11/lib/libexecinfo/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libexecinfo/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-LIBEXECINFO= ${.CURDIR}/../../contrib/libexecinfo
+LIBEXECINFO= ${SRCTOP}/contrib/libexecinfo
LIB= execinfo
SHLIB_MAJOR= 1
Modified: stable/11/lib/libexpat/Makefile
==============================================================================
--- stable/11/lib/libexpat/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libexpat/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-EXPAT= ${.CURDIR}/../../contrib/expat
+EXPAT= ${SRCTOP}/contrib/expat
LIB= bsdxml
SHLIBDIR?= /lib
Modified: stable/11/lib/libgssapi/Makefile
==============================================================================
--- stable/11/lib/libgssapi/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libgssapi/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
PACKAGE=lib${LIB}
LIB= gssapi
SHLIB_MAJOR= 10
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
SRCS=
Modified: stable/11/lib/libiconv_modules/Makefile.inc
==============================================================================
--- stable/11/lib/libiconv_modules/Makefile.inc Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libiconv_modules/Makefile.inc Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../libc/iconv
+.PATH: ${SRCTOP}/lib/libc/iconv
SHLIB_MAJOR= 4
WARNS?= 6
-CFLAGS+= -I${.CURDIR}/../../libc/iconv
+CFLAGS+= -I${SRCTOP}/lib/libc/iconv
CFLAGS+= -Dbool=_Bool
Modified: stable/11/lib/libiconv_modules/mapper_parallel/Makefile
==============================================================================
--- stable/11/lib/libiconv_modules/mapper_parallel/Makefile Fri Feb 10
07:22:12 2017 (r313537)
+++ stable/11/lib/libiconv_modules/mapper_parallel/Makefile Fri Feb 10
07:32:40 2017 (r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../mapper_serial
+.PATH: ${.CURDIR:H}/mapper_serial
SHLIB= mapper_parallel
SRCS+= citrus_mapper_serial.c
Modified: stable/11/lib/libkiconv/Makefile
==============================================================================
--- stable/11/lib/libkiconv/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libkiconv/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -17,7 +17,7 @@ MLINKS+= kiconv.3 kiconv_add_xlat16_cspa
kiconv.3 kiconv_add_xlat16_cspairs.3 \
kiconv.3 kiconv_add_xlat16_table.3
-CFLAGS+= -I${.CURDIR}/../../sys
+CFLAGS+= -I${SRCTOP}/sys
WARNS?= 1
Modified: stable/11/lib/libldns/Makefile
==============================================================================
--- stable/11/lib/libldns/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libldns/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR = ${.CURDIR}/../../contrib/ldns
+LDNSDIR = ${SRCTOP}/contrib/ldns
PACKAGE=lib${LIB}
.PATH: ${LDNSDIR} ${LDNSDIR}/compat
Modified: stable/11/lib/liblzma/Makefile
==============================================================================
--- stable/11/lib/liblzma/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/liblzma/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -2,9 +2,9 @@
PACKAGE=lib${LIB}
LIB= lzma
-LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
+LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma
-.PATH: ${LZMADIR}/../common
+.PATH: ${LZMADIR:H}/common
SRCS+= tuklib_physmem.c tuklib_cpucores.c
.PATH: ${LZMADIR}/api/lzma
@@ -145,7 +145,7 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMADIR}/lzma \
-I${LZMADIR}/delta \
-I${LZMADIR}/simple \
- -I${LZMADIR}/../common
+ -I${LZMADIR:H}/common
LIBADD+= pthread
Modified: stable/11/lib/libmagic/Makefile
==============================================================================
--- stable/11/lib/libmagic/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libmagic/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -2,7 +2,7 @@
# Copyright (c) David E. O'Brien, 2000-2004, 2006, 2009
PACKAGE=lib${LIB}
-CONTRDIR= ${.CURDIR}/../../contrib/file
+CONTRDIR= ${SRCTOP}/contrib/file
.PATH: ${CONTRDIR}/src
.PATH: ${CONTRDIR}/doc
Modified: stable/11/lib/libmd/Makefile
==============================================================================
--- stable/11/lib/libmd/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libmd/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -78,11 +78,11 @@ CLEANFILES+= md[245]hl.c md[245].ref md[
# in which case:
# * macros are used to rename symbols to libcrypt internal names
# * no weak aliases are generated
-CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../sys/crypto/sha2
-CFLAGS+= -I${.CURDIR}/../../sys/crypto/skein
+CFLAGS+= -I${.CURDIR} -I${SRCTOP}/sys/crypto/sha2
+CFLAGS+= -I${SRCTOP}/sys/crypto/skein
CFLAGS+= -DWEAK_REFS
-.PATH: ${.CURDIR}/${MACHINE_ARCH} ${.CURDIR}/../../sys/crypto/sha2
-.PATH: ${.CURDIR}/../../sys/crypto/skein
${.CURDIR}/../../sys/crypto/skein/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/${MACHINE_ARCH} ${SRCTOP}/sys/crypto/sha2
+.PATH: ${SRCTOP}/sys/crypto/skein ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH}
.if exists(${MACHINE_ARCH}/sha.S)
SRCS+= sha.S
Modified: stable/11/lib/libmilter/Makefile
==============================================================================
--- stable/11/lib/libmilter/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libmilter/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
Modified: stable/11/lib/libmp/Makefile
==============================================================================
--- stable/11/lib/libmp/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libmp/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -10,9 +10,9 @@ MAN= libmp.3
INCS= mp.h
SRCS= mpasbn.c
-CFLAGS+= -I${.CURDIR}/../../crypto
+CFLAGS+= -I${SRCTOP}/crypto
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no"
Modified: stable/11/lib/libngatm/Makefile
==============================================================================
--- stable/11/lib/libngatm/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libngatm/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -8,8 +8,8 @@ SHLIB_MAJOR= 4
MAN= libngatm.3 uniaddr.3 unifunc.3 unimsg.3 unisap.3 unistruct.3
# source of the library lives in contrib
-SDIR= ${.CURDIR}/../../sys
-CTRB= ${.CURDIR}/../../contrib/ngatm
+SDIR= ${SRCTOP}/sys
+CTRB= ${SRCTOP}/contrib/ngatm
LIBBASE= ${SDIR}/contrib/ngatm
CFLAGS+= -I${LIBBASE} -I${.OBJDIR} -I${CTRB}/libngatm
Modified: stable/11/lib/libnv/Makefile
==============================================================================
--- stable/11/lib/libnv/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libnv/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -8,8 +8,8 @@ SHLIBDIR?= /lib
LIB= nv
SHLIB_MAJOR= 0
-.PATH: ${.CURDIR}/../../sys/contrib/libnv ${.CURDIR}/../../sys/sys
-CFLAGS+=-I${.CURDIR}/../../sys -I${.CURDIR}
+.PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
+CFLAGS+=-I${SRCTOP}/sys -I${.CURDIR}
SRCS= dnvlist.c
SRCS+= msgio.c
Modified: stable/11/lib/libopie/Makefile
==============================================================================
--- stable/11/lib/libopie/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libopie/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
PACKAGE=lib${LIB}
-OPIE_DIST?= ${.CURDIR}/../../contrib/opie
+OPIE_DIST?= ${SRCTOP}/contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
SHLIB_MAJOR= 8
Modified: stable/11/lib/libpam/libpam/Makefile
==============================================================================
--- stable/11/lib/libpam/libpam/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libpam/libpam/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -36,7 +36,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-OPENPAM= ${.CURDIR}/../../../contrib/openpam
+OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/include ${OPENPAM}/lib/libpam ${OPENPAM}/doc/man
# static_libpam will build libpam.a
Modified: stable/11/lib/libpam/modules/Makefile.inc
==============================================================================
--- stable/11/lib/libpam/modules/Makefile.inc Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libpam/modules/Makefile.inc Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,11 +1,11 @@
# $FreeBSD$
-PAMDIR= ${.CURDIR}/../../../../contrib/openpam
+PAMDIR= ${SRCTOP}/contrib/openpam
MK_INSTALLLIB= no
MK_PROFILE= no
-CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+CFLAGS+= -I${PAMDIR}/include -I${SRCTOP}/lib/libpam
SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR}
LIBADD+= pam
Modified: stable/11/lib/libpam/modules/pam_passwdqc/Makefile
==============================================================================
--- stable/11/lib/libpam/modules/pam_passwdqc/Makefile Fri Feb 10 07:22:12
2017 (r313537)
+++ stable/11/lib/libpam/modules/pam_passwdqc/Makefile Fri Feb 10 07:32:40
2017 (r313538)
@@ -1,6 +1,6 @@
# $FreeBSD$
-SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc
.PATH: ${SRCDIR}
LIB= pam_passwdqc
Modified: stable/11/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- stable/11/lib/libpam/modules/pam_ssh/Makefile Fri Feb 10 07:22:12
2017 (r313537)
+++ stable/11/lib/libpam/modules/pam_ssh/Makefile Fri Feb 10 07:32:40
2017 (r313538)
@@ -1,7 +1,7 @@
# PAM module for SSH
# $FreeBSD$
-SSHDIR= ${.CURDIR}/../../../../crypto/openssh
+SSHDIR= ${SRCTOP}/crypto/openssh
LIB= pam_ssh
MAN= pam_ssh.8
Modified: stable/11/lib/libpam/static_libpam/Makefile
==============================================================================
--- stable/11/lib/libpam/static_libpam/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libpam/static_libpam/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -35,7 +35,7 @@
#
# $FreeBSD$
-.PATH: ${.CURDIR}/../libpam
+.PATH: ${SRCTOP}/lib/libpam
# Only build the static library.
LIB= pam
@@ -66,4 +66,4 @@ CLEANFILES+= openpam_static.o \
openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}
-.include "${.CURDIR}/../libpam/Makefile"
+.include "${.CURDIR:H}/libpam/Makefile"
Modified: stable/11/lib/libpcap/Makefile
==============================================================================
--- stable/11/lib/libpcap/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libpcap/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -114,7 +114,7 @@ SHLIB_MAJOR= 8
#
# Magic to grab sources out of src/contrib
#
-PCAP_DISTDIR?=${.CURDIR}/../../contrib/libpcap
+PCAP_DISTDIR?=${SRCTOP}/contrib/libpcap
CFLAGS+=-I${PCAP_DISTDIR}
.PATH: ${PCAP_DISTDIR}
.PATH: ${PCAP_DISTDIR}/bpf/net
Modified: stable/11/lib/libpe/Makefile
==============================================================================
--- stable/11/lib/libpe/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libpe/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
INTERNALLIB=
-ELFTCDIR= ${.CURDIR}/../../contrib/elftoolchain
+ELFTCDIR= ${SRCTOP}/contrib/elftoolchain
.PATH: ${ELFTCDIR}/libpe
Modified: stable/11/lib/libproc/Makefile
==============================================================================
--- stable/11/lib/libproc/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libproc/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -29,9 +29,9 @@ LIBADD+= elf rtld_db util
.if ${MK_CDDL} != "no"
LIBADD+= ctf
IGNORE_PRAGMA= YES
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \
- -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \
- -I${.CURDIR}/../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
+ -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
+ -I${SRCTOP}/sys/cddl/compat/opensolaris
.else
CFLAGS+= -DNO_CTF
.endif
Modified: stable/11/lib/libprocstat/zfs/Makefile
==============================================================================
--- stable/11/lib/libprocstat/zfs/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libprocstat/zfs/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,21 +1,21 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR:H}
SRCS= zfs.c
OBJS= zfs.o
WARNS?= 1
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/..
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR:H}
CFLAGS+= -DNEED_SOLARIS_BOOLEAN
all: ${OBJS}
Modified: stable/11/lib/librpcsec_gss/Makefile
==============================================================================
--- stable/11/lib/librpcsec_gss/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/librpcsec_gss/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -8,11 +8,11 @@ SRCS+= rpcsec_gss.c rpcsec_gss_prot.c rp
LIBADD= gssapi
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-CFLAGS+= -I${.CURDIR}/../../include
-CFLAGS+= -I${.CURDIR}/../../libc_rpc
+CFLAGS+= -I${SRCTOP}/include
+CFLAGS+= -I${SRCTOP}/lib/libc_rpc
MK_PROFILE= no
MAN= rpcsec_gss.3
Modified: stable/11/lib/librpcsvc/Makefile
==============================================================================
--- stable/11/lib/librpcsvc/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/librpcsvc/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../include/rpcsvc
+.PATH: ${SRCTOP}/include/rpcsvc
PACKAGE=lib${LIB}
LIB= rpcsvc
Modified: stable/11/lib/librt/Makefile
==============================================================================
--- stable/11/lib/librt/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/librt/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -5,7 +5,7 @@
PACKAGE=lib${LIB}
LIB=rt
SHLIB_MAJOR= 1
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}
.ifndef NO_THREAD_STACK_UNWIND
CFLAGS+=-fexceptions
.endif
@@ -18,7 +18,7 @@ SRCS+= aio.c mq.c sigev_thread.c timer.c
PRECIOUSLIB=
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/Symbol.map
.if ${MK_TESTS} != "no"
Modified: stable/11/lib/libsbuf/Makefile
==============================================================================
--- stable/11/lib/libsbuf/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsbuf/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -10,6 +10,6 @@ SHLIB_MAJOR = 6
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
VERSION_DEF= ${.CURDIR}/Version.def
-.PATH: ${.CURDIR}/../../sys/kern
+.PATH: ${SRCTOP}/sys/kern
.include <bsd.lib.mk>
Modified: stable/11/lib/libsm/Makefile
==============================================================================
--- stable/11/lib/libsm/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsm/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PACKAGE=sendmail
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsm
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
Modified: stable/11/lib/libsmb/Makefile
==============================================================================
--- stable/11/lib/libsmb/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsmb/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -3,7 +3,7 @@
.include <src.opts.mk>
PACKAGE=lib${LIB}
-CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
+CONTRIBDIR= ${SRCTOP}/contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
LIB= smb
Modified: stable/11/lib/libsmdb/Makefile
==============================================================================
--- stable/11/lib/libsmdb/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsmdb/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmdb
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
Modified: stable/11/lib/libsmutil/Makefile
==============================================================================
--- stable/11/lib/libsmutil/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsmutil/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,7 +1,7 @@
# $FreeBSD$
PACKAGE=lib${LIB}
-SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
+SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/libsmutil
CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I.
Modified: stable/11/lib/libsqlite3/Makefile
==============================================================================
--- stable/11/lib/libsqlite3/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsqlite3/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -8,7 +8,7 @@ LIBADD+= pthread
SRCS= sqlite3.c
-SQLITE= ${.CURDIR}/../../contrib/sqlite3
+SQLITE= ${SRCTOP}/contrib/sqlite3
.PATH: ${SQLITE}
WARNS= 3
Modified: stable/11/lib/libstdthreads/Makefile
==============================================================================
--- stable/11/lib/libstdthreads/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libstdthreads/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -35,7 +35,7 @@ MLINKS= thrd_create.3 call_once.3 \
LIBADD= pthread
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
+VERSION_DEF= ${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
.include <bsd.lib.mk>
Modified: stable/11/lib/libsysdecode/Makefile
==============================================================================
--- stable/11/lib/libsysdecode/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libsysdecode/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -9,8 +9,8 @@ SRCS= errno.c flags.c ioctl.c signal.c s
INCS= sysdecode.h
CFLAGS+= -I${.OBJDIR}
-CFLAGS+= -I${.CURDIR}/../../sys
-CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf
+CFLAGS+= -I${SRCTOP}/sys
+CFLAGS+= -I${SRCTOP}/libexec/rtld-elf
MAN= sysdecode.3 \
sysdecode_abi_to_freebsd_errno.3 \
Modified: stable/11/lib/libtelnet/Makefile
==============================================================================
--- stable/11/lib/libtelnet/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libtelnet/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -4,7 +4,7 @@
.include <src.opts.mk>
PACKAGE=lib${LIB}
-TELNETDIR= ${.CURDIR}/../../contrib/telnet
+TELNETDIR= ${SRCTOP}/contrib/telnet
.PATH: ${TELNETDIR}/libtelnet
LIB= telnet
Modified: stable/11/lib/libthr/Makefile
==============================================================================
--- stable/11/lib/libthr/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libthr/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -18,13 +18,13 @@ LIB=thr
SHLIB_MAJOR= 3
WARNS?= 3
CFLAGS+=-DPTHREAD_KERNEL
-CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
- -I${.CURDIR}/../../include
+CFLAGS+=-I${SRCTOP}/lib/libc/include -I${.CURDIR}/thread \
+ -I${SRCTOP}/include
CFLAGS+=-I${.CURDIR}/arch/${MACHINE_CPUARCH}/include
CFLAGS+=-I${.CURDIR}/sys
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf
-CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf/${MACHINE_CPUARCH}
-CFLAGS+=-I${.CURDIR}/../libthread_db
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf
+CFLAGS+=-I${SRCTOP}/libexec/rtld-elf/${MACHINE_CPUARCH}
+CFLAGS+=-I${SRCTOP}/lib/libthread_db
CFLAGS+=-Winline
.ifndef NO_THREAD_UNWIND_STACK
@@ -34,7 +34,7 @@ CFLAGS+=-D_PTHREAD_FORCED_UNWIND
LDFLAGS+=-Wl,-znodelete
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
SYMBOL_MAPS=${.CURDIR}/pthread.map
MAN= libthr.3
Modified: stable/11/lib/libthr/support/Makefile.inc
==============================================================================
--- stable/11/lib/libthr/support/Makefile.inc Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libthr/support/Makefile.inc Fri Feb 10 07:32:40 2017
(r313538)
@@ -1,15 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/support ${.CURDIR}/../libc/gen ${.CURDIR}/../libc/string
+.PATH: ${.CURDIR}/support ${SRCTOP}/lib/libc/gen ${SRCTOP}/lib/libc/string
# libc must search machine_arch, then machine_cpuarch, but libthr has all its
# code implemented in machine_cpuarch. Cope.
-.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys)
-.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_ARCH}
+.if exists(${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys)
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_ARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_ARCH}
.else
-.PATH: ${.CURDIR}/../libc/${MACHINE_CPUARCH}/sys
-CFLAGS+= -I${.CURDIR}/../libc/${MACHINE_CPUARCH}
+.PATH: ${SRCTOP}/lib/libc/${MACHINE_CPUARCH}/sys
+CFLAGS+= -I${SRCTOP}/lib/libc/${MACHINE_CPUARCH}
.endif
SYSCALLS= thr_new
Modified: stable/11/lib/libthread_db/Makefile
==============================================================================
--- stable/11/lib/libthread_db/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libthread_db/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -15,7 +15,7 @@ CFLAGS+=-I. -I${.CURDIR}
SYM_MAPS+=${.CURDIR}/Symbol.map
SYMBOL_MAPS=${SYM_MAPS}
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
# Unfortunately, clang gives an incorrect warning about alignment in
# arch/i386/libpthread_md.c, so turn that off for now.
Modified: stable/11/lib/libufs/Makefile
==============================================================================
--- stable/11/lib/libufs/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libufs/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -18,7 +18,7 @@ MLINKS+= ufs_disk_close.3 ufs_disk_fillo
MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
MLINKS+= ufs_disk_close.3 ufs_disk_write.3
-.PATH: ${.CURDIR}/../../sys/ufs/ffs
+.PATH: ${SRCTOP}/sys/ufs/ffs
WARNS?= 2
Modified: stable/11/lib/libulog/Makefile
==============================================================================
--- stable/11/lib/libulog/Makefile Fri Feb 10 07:22:12 2017
(r313537)
+++ stable/11/lib/libulog/Makefile Fri Feb 10 07:32:40 2017
(r313538)
@@ -22,7 +22,7 @@ MLINKS+=ulog_login.3 ulog_login_pseudo.3
LIBADD= md
-VERSION_DEF= ${.CURDIR}/../libc/Versions.def
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
