Author: ngie
Date: Tue May 30 05:15:09 2017
New Revision: 319191
URL: https://svnweb.freebsd.org/changeset/base/319191
Log:
MFC
r314451,r314452,r314453,r314456,r314457,r314458,r314459,r314460,r314461,r314462,r314464,r314466,r314468,r314470,r314472,r314478:
r314451:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
The SRCTOP conversion simplifies pathing in make/displayed output.
Also, while here, change a hardcoded path to ar5523.bin.uu in the make target
with ${.ALLSRC} .
r314452:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
r314453:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
r314456:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314457:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
The SRCTOP conversion simplifies pathing in make/displayed output.
Also, while here, change a hardcoded path to ${RPCDIR}/ypupdate_prot.x in
the make targets with ${.ALLSRC} .
r314458:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314459:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314460:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314461:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314462:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
The SRCTOP conversion simplifies pathing in make/displayed output.
Also, while here, change a hardcoded path to ${RPCDIR}/ypxfrd.x in
the make targets with ${.ALLSRC} .
r314464:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314466:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314468:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
Also, use :H where possible/sensical to manipulate .CURDIR-relative paths
This simplifies pathing in make/displayed output.
r314470:
Use SRCTOP-relative paths to other directories instead of .CURDIR-relative
ones
This simplifies pathing in make/displayed output.
r314472:
Simplify/improve idioms in usr.sbin/ntp Makefiles
- Use SRCTOP-relative paths to other directories instead of
.CURDIR-relative ones. This simplifies pathing in make/displayed output.
- Also, use :H where possible/sensical to manipulate .CURDIR-relative
paths
- Remove superfluous bsd.own.mk .includes which are already handled via
src.opts.mk .includes
r314478:
Simplify idioms in Makefiles further
- Use SRCTOP-relative paths instead of .CURDIR-relative ones where possible
- Use :H to manipulate .CURDIR in areas instead of ..-relative paths.
Modified:
stable/11/usr.sbin/fstyp/Makefile
stable/11/usr.sbin/ntp/doc/Makefile
stable/11/usr.sbin/ntp/doc/drivers/Makefile
stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile
stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile
stable/11/usr.sbin/ntp/doc/hints/Makefile
stable/11/usr.sbin/ntp/doc/icons/Makefile
stable/11/usr.sbin/ntp/doc/pic/Makefile
stable/11/usr.sbin/ntp/doc/scripts/Makefile
stable/11/usr.sbin/ntp/libntp/Makefile
stable/11/usr.sbin/ntp/libntpevent/Makefile
stable/11/usr.sbin/ntp/libopts/Makefile
stable/11/usr.sbin/ntp/libparse/Makefile
stable/11/usr.sbin/ntp/ntp-keygen/Makefile
stable/11/usr.sbin/ntp/ntpd/Makefile
stable/11/usr.sbin/ntp/ntpdate/Makefile
stable/11/usr.sbin/ntp/ntpdc/Makefile
stable/11/usr.sbin/ntp/ntpq/Makefile
stable/11/usr.sbin/ntp/ntptime/Makefile
stable/11/usr.sbin/ntp/sntp/Makefile
stable/11/usr.sbin/rpc.yppasswdd/Makefile
stable/11/usr.sbin/rpc.ypupdated/Makefile
stable/11/usr.sbin/rpc.ypxfrd/Makefile
stable/11/usr.sbin/tcpdchk/Makefile
stable/11/usr.sbin/tcpdmatch/Makefile
stable/11/usr.sbin/traceroute/Makefile
stable/11/usr.sbin/traceroute6/Makefile
stable/11/usr.sbin/uathload/Makefile
stable/11/usr.sbin/unbound/anchor/Makefile
stable/11/usr.sbin/unbound/checkconf/Makefile
stable/11/usr.sbin/unbound/control/Makefile
stable/11/usr.sbin/unbound/daemon/Makefile
stable/11/usr.sbin/yp_mkdb/Makefile
stable/11/usr.sbin/ypldap/Makefile
stable/11/usr.sbin/yppush/Makefile
stable/11/usr.sbin/ypserv/Makefile
stable/11/usr.sbin/zic/Makefile.inc
stable/11/usr.sbin/zic/zdump/Makefile
stable/11/usr.sbin/zic/zic/Makefile
stable/11/usr.sbin/zonectl/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/usr.sbin/fstyp/Makefile
==============================================================================
--- stable/11/usr.sbin/fstyp/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/fstyp/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -24,15 +24,15 @@ CFLAGS+=-I${SRCTOP}/sys
IGNORE_PRAGMA= YES
CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS
-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/libnvpair
-CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common
-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${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/libnvpair
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+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
.endif
LIBADD= geom md
Modified: stable/11/usr.sbin/ntp/doc/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -25,10 +25,9 @@ FILES= access.html accopt.html assoc.html audio.html a
MAN= ntp.conf.5 ntp.keys.5
MAN+= ntp-keygen.8 ntpd.8 ntpdate.8 ntpdc.8 ntpq.8 ntptime.8 sntp.8
-.PATH: ${.CURDIR}/../../../contrib/ntp/html \
- ${.CURDIR}/../../../contrib/ntp/util \
- ${.CURDIR}/../../../contrib/ntp/util \
- ${.CURDIR}/../../../contrib/ntp/ntpd \
- ${.CURDIR}/../../../contrib/ntp/ntpsnmpd
+.PATH: ${SRCTOP}/contrib/ntp/html \
+ ${SRCTOP}/contrib/ntp/util \
+ ${SRCTOP}/contrib/ntp/ntpd \
+ ${SRCTOP}/contrib/ntp/ntpsnmpd
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/drivers/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/drivers/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/drivers/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -16,6 +16,6 @@ FILES= driver1.html driver10.html driver11.html driver
driver9.html mx4200data.html oncore-shmem.html tf582_4.html
.endif
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/drivers
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile Tue May 30 04:45:11
2017 (r319190)
+++ stable/11/usr.sbin/ntp/doc/drivers/icons/Makefile Tue May 30 05:15:09
2017 (r319191)
@@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/drivers/icons
FILES= home.gif mail2.gif
.endif
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/icons
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile Tue May 30 04:45:11
2017 (r319190)
+++ stable/11/usr.sbin/ntp/doc/drivers/scripts/Makefile Tue May 30 05:15:09
2017 (r319191)
@@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/drivers/scripts
FILES= footer.txt style.css
.endif
-.PATH: ${.CURDIR}/../../../../../contrib/ntp/html/drivers/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/drivers/scripts
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/hints/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/hints/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/hints/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -12,6 +12,6 @@ FILES= a-ux aix bsdi changes decosf1 decosf2 freebsd h
sun4 svr4-dell svr4_package todo vxworks.html winnt.html
.endif
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/hints
+.PATH: ${SRCTOP}/contrib/ntp/html/hints
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/icons/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/icons/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/icons/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -8,6 +8,6 @@ FILESDIR= ${SHAREDIR}/doc/ntp/icons
FILES= home.gif mail2.gif sitemap.png
.endif
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/icons
+.PATH: ${SRCTOP}/contrib/ntp/html/icons
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/pic/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/pic/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/pic/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -22,6 +22,6 @@ FILES= 9400n.jpg alice11.gif alice13.gif alice15.gif a
wingdorothy.gif
.endif
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/pic
+.PATH: ${SRCTOP}/contrib/ntp/html/pic
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/doc/scripts/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/doc/scripts/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/doc/scripts/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -10,6 +10,6 @@ FILES= accopt.txt audio.txt authopt.txt clockopt.txt c
misc.txt miscopt.txt monopt.txt refclock.txt special.txt style.css
.endif
-.PATH: ${.CURDIR}/../../../../contrib/ntp/html/scripts
+.PATH: ${SRCTOP}/contrib/ntp/html/scripts
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/libntp/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/libntp/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/libntp/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,10 +1,10 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/ntp/libntp \
- ${.CURDIR}/../../../contrib/ntp/lib/isc \
- ${.CURDIR}/../../../contrib/ntp/lib/isc/nls \
- ${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads \
- ${.CURDIR}/../../../contrib/ntp/lib/isc/unix \
+.PATH: ${SRCTOP}/contrib/ntp/libntp \
+ ${SRCTOP}/contrib/ntp/lib/isc \
+ ${SRCTOP}/contrib/ntp/lib/isc/nls \
+ ${SRCTOP}/contrib/ntp/lib/isc/pthreads \
+ ${SRCTOP}/contrib/ntp/lib/isc/unix \
LIB= ntp
INTERNALLIB=
@@ -73,14 +73,14 @@ ISC_SRCS= assertions.c \
SRCS= ${NTP_SRCS} ${ISC_SRCS} version.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
- -I${.CURDIR}/../../../lib/libedit/edit \
- -I${.CURDIR}/../ \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${SRCTOP}/lib/libc/${MACHINE_ARCH} \
+ -I${SRCTOP}/lib/libedit/edit \
+ -I${.CURDIR:H} \
-I${.CURDIR}/
CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
@@ -88,6 +88,6 @@ CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
CLEANFILES+= .version version.c
version.c:
- sh -e ${.CURDIR}/../scripts/mkver ntpd
+ sh -e ${.CURDIR:H}/scripts/mkver ntpd
.include <bsd.lib.mk>
Modified: stable/11/usr.sbin/ntp/libntpevent/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/libntpevent/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/libntpevent/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libevent
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent
LIB= ntpevent
INTERNALLIB=
@@ -25,8 +25,8 @@ NTP_ATOMIC=sparc64
NTP_ATOMIC=noatomic
.endif
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libevent/include \
-I${.CURDIR}/
CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
Modified: stable/11/usr.sbin/ntp/libopts/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/libopts/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/libopts/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,14 +1,14 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp/libopts
+.PATH: ${SRCTOP}/contrib/ntp/sntp/libopts
LIB= opts
INTERNALLIB=
SRCS= libopts.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${.CURDIR:H}
.include <bsd.lib.mk>
Modified: stable/11/usr.sbin/ntp/libparse/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/libparse/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/libparse/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/ntp/libparse
+.PATH: ${SRCTOP}/contrib/ntp/libparse
LIB= parse
INTERNALLIB=
@@ -12,8 +12,8 @@ SRCS= binio.c clk_computime.c clk_dcf7000.c clk_hopf60
info_trimble.c mfp_mul.c parse.c parse_conf.c \
trim_info.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include -I${.CURDIR:H}
.include <bsd.lib.mk>
Modified: stable/11/usr.sbin/ntp/ntp-keygen/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntp-keygen/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntp-keygen/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -4,21 +4,21 @@ MAN=
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/util \
- ${.CURDIR}/../../../contrib/ntp/ntpd
+.PATH: ${SRCTOP}/contrib/ntp/util \
+ ${SRCTOP}/contrib/ntp/ntpd
PROG= ntp-keygen
SRCS= ntp-keygen.c ntp-keygen-opts.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+ -I${.CURDIR:H}
LIBADD+= ntp opts pthread
Modified: stable/11/usr.sbin/ntp/ntpd/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntpd/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntpd/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -4,7 +4,7 @@ MAN=
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd \
+.PATH: ${SRCTOP}/contrib/ntp/ntpd \
${.OBJDIR}
PROG= ntpd
@@ -27,13 +27,13 @@ SRCS= cmd_args.c ntp_config.c ntp_control.c ntp_crypto
refclock_tt560.c refclock_ulink.c refclock_wwv.c refclock_wwvb.c \
refclock_zyfer.c version.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/ntpd \
- -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../ \
+CFLAGS+= -I${SRCTOP}/contrib/ntp/ntpd \
+ -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${.CURDIR:H} \
-I${.CURDIR}
LIBADD= parse ntp m opts pthread
@@ -46,7 +46,7 @@ LIBADD+= md
CLEANFILES+= .version version.c
-version.c:
- sh -e ${.CURDIR}/../scripts/mkver ntpd
+version.c:
+ sh -e ${.CURDIR:H}/scripts/mkver ntpd
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/ntpdate/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntpdate/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntpdate/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,17 +2,17 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
+.PATH: ${SRCTOP}/contrib/ntp/ntpdate
PROG= ntpdate
MAN=
SRCS= ntpdate.c version.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${.CURDIR:H}
LIBADD= ntp m pthread
@@ -24,7 +24,7 @@ LIBADD+= md
CLEANFILES+= .version version.c
-version.c:
- sh -e ${.CURDIR}/../scripts/mkver ntpdate
+version.c:
+ sh -e ${.CURDIR:H}/scripts/mkver ntpdate
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/ntpdc/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntpdc/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntpdc/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -3,20 +3,19 @@
MAN=
.include <src.opts.mk>
-.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc
+.PATH: ${SRCTOP}/contrib/ntp/ntpdc
PROG= ntpdc
SRCS= ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../../../lib/libc/${MACHINE_ARCH} \
- -I${.CURDIR}/../ -I${.CURDIR}
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${.CURDIR}/lib/libc/${MACHINE_ARCH} \
+ -I${.CURDIR:H} -I${.CURDIR}
LIBADD= edit ntp m opts pthread
CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
@@ -31,6 +30,6 @@ LIBADD+= md
CLEANFILES+= .version version.c
version.c:
- sh -e ${.CURDIR}/../scripts/mkver ntpdc
+ sh -e ${.CURDIR:H}/scripts/mkver ntpdc
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/ntpq/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntpq/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntpq/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -3,23 +3,22 @@
MAN=
.include <src.opts.mk>
-.include <bsd.own.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq
+.PATH: ${SRCTOP}/contrib/ntp/ntpq
BINDIR= /usr/bin
PROG= ntpq
SRCS= ntpq.c ntpq-opts.c ntpq-subs.c version.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/${NTP_ATOMIC}/include \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${.CURDIR:H}
LIBADD+= edit ntp opts m pthread
@@ -35,6 +34,6 @@ CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
CLEANFILES+= .version version.c
version.c:
- sh -e ${.CURDIR}/../scripts/mkver ntpq
+ sh -e ${.CURDIR:H}/scripts/mkver ntpq
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/ntp/ntptime/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/ntptime/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/ntptime/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,15 +1,15 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/ntp/util
+.PATH: ${SRCTOP}/contrib/ntp/util
PROG= ntptime
MAN=
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include/ \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include/ \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include/ \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include/ \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${.CURDIR:H}
LIBADD= ntp pthread
Modified: stable/11/usr.sbin/ntp/sntp/Makefile
==============================================================================
--- stable/11/usr.sbin/ntp/sntp/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ntp/sntp/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,23 +2,23 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../../contrib/ntp/sntp
+.PATH: ${SRCTOP}/contrib/ntp/sntp
PROG= sntp
MAN=
SRCS= crypto.c kod_management.c log.c main.c networking.c \
sntp-opts.c sntp.c utilities.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/unix/include \
- -I${.CURDIR}/../../../contrib/ntp/lib/isc/pthreads/include \
- -I${.CURDIR}/../../../contrib/ntp/sntp \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libopts \
- -I${.CURDIR}/../../../contrib/ntp/sntp/libevent/include \
- -I${.CURDIR}/../libntpevent \
- -I${.CURDIR}/../
+CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/unix/include \
+ -I${SRCTOP}/contrib/ntp/lib/isc/pthreads/include \
+ -I${SRCTOP}/contrib/ntp/sntp \
+ -I${SRCTOP}/contrib/ntp/sntp/libopts \
+ -I${SRCTOP}/contrib/ntp/sntp/libevent/include \
+ -I${.CURDIR:H}/libntpevent \
+ -I${.CURDIR:H}
LIBADD= m opts ntp ntpevent pthread
Modified: stable/11/usr.sbin/rpc.yppasswdd/Makefile
==============================================================================
--- stable/11/usr.sbin/rpc.yppasswdd/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/rpc.yppasswdd/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,8 +2,8 @@
RPCDIR= ${DESTDIR}/usr/include/rpcsvc
-.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \
- ${.CURDIR}/../../libexec/ypxfr ${RPCDIR}
+.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \
+ ${SRCTOP}/libexec/ypxfr ${RPCDIR}
PROG= rpc.yppasswdd
SCRIPTS=yppwupdate
@@ -16,9 +16,9 @@ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h y
WARNS?= 5
CFLAGS+= -fno-strict-aliasing
-CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \
- -I${.CURDIR}/../../usr.sbin/ypserv \
- -I${.CURDIR}/../../libexec/ypxfr \
+CFLAGS+= -I${SRCTOP}/usr.sbin/vipw \
+ -I${SRCTOP}/usr.sbin/ypserv \
+ -I${SRCTOP}/libexec/ypxfr \
-I${.CURDIR} -I.
LIBADD= rpcsvc crypt util
Modified: stable/11/usr.sbin/rpc.ypupdated/Makefile
==============================================================================
--- stable/11/usr.sbin/rpc.ypupdated/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/rpc.ypupdated/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
+.PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
PROG= rpc.ypupdated
MAN=
@@ -9,7 +9,7 @@ SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_ma
yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c
#CFLAGS+= -DYP
-CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr
+CFLAGS+= -I${SRCTOP}/usr.sbin/ypserv -I. -I${SRCTOP}/libexec/ypxfr
WARNS?= 1
@@ -24,10 +24,10 @@ RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# ypupdated_main.c can see it.
ypupdate_prot_svc.c: ${RPCDIR}/ypupdate_prot.x
rm -f ${.TARGET}
- ${RPCGEN} -m ${RPCDIR}/ypupdate_prot.x | \
+ ${RPCGEN} -m ${.ALLSRC} | \
sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET}
ypupdate_prot.h: ${RPCDIR}/ypupdate_prot.x
- ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypupdate_prot.x
+ ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/rpc.ypxfrd/Makefile
==============================================================================
--- stable/11/usr.sbin/rpc.ypxfrd/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/rpc.ypxfrd/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../usr.sbin/ypserv
+.PATH: ${SRCTOP}/usr.sbin/ypserv
PROG= rpc.ypxfrd
MAN= rpc.ypxfrd.8
@@ -15,14 +15,14 @@ LIBADD= rpcsvc
CLEANFILES= ypxfrd_svc.c ypxfrd.h
-RPCDIR= ${.CURDIR}/../../include/rpcsvc
+RPCDIR= ${SRCTOP}/include/rpcsvc
RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -I -C
# We need to remove the 'static' keyword from _rpcsvcstate so that
# ypxfrd_main.c can see it.
ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x
rm -f ${.TARGET}
- ${RPCGEN} -m ${RPCDIR}/ypxfrd.x | \
+ ${RPCGEN} -m ${.ALLSRC} | \
sed s/"static int _rpcsvcstate"/"int _rpcsvcstate"/g > ${.TARGET}
# ypxfrd_xdr.c: ${RPCDIR}/ypxfrd.x
@@ -31,6 +31,6 @@ ypxfrd_svc.c: ${RPCDIR}/ypxfrd.x
ypxfrd.h: ${RPCDIR}/ypxfrd.x
rm -f ${.TARGET}
- ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/ypxfrd.x
+ ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/tcpdchk/Makefile
==============================================================================
--- stable/11/usr.sbin/tcpdchk/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/tcpdchk/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
PROG= tcpdchk
MAN= tcpdchk.8
Modified: stable/11/usr.sbin/tcpdmatch/Makefile
==============================================================================
--- stable/11/usr.sbin/tcpdmatch/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/tcpdmatch/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,7 +2,7 @@
.include <src.opts.mk>
-.PATH: ${.CURDIR}/../../contrib/tcp_wrappers
+.PATH: ${SRCTOP}/contrib/tcp_wrappers
PROG= tcpdmatch
MAN= tcpdmatch.8
Modified: stable/11/usr.sbin/traceroute/Makefile
==============================================================================
--- stable/11/usr.sbin/traceroute/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/traceroute/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
.PATH: ${TRACEROUTE_DISTDIR}
PROG= traceroute
Modified: stable/11/usr.sbin/traceroute6/Makefile
==============================================================================
--- stable/11/usr.sbin/traceroute6/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/traceroute6/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -13,7 +13,7 @@
# A PARTICULAR PURPOSE.
# $FreeBSD$
-TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute
+TRACEROUTE_DISTDIR?= ${SRCTOP}/contrib/traceroute
.PATH: ${TRACEROUTE_DISTDIR}
PROG= traceroute6
Modified: stable/11/usr.sbin/uathload/Makefile
==============================================================================
--- stable/11/usr.sbin/uathload/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/uathload/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -10,7 +10,7 @@ FILESMODE= 444
CLEANFILES= ar5523.bin
-ar5523.bin: ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu
- uudecode -p ${.CURDIR}/../../sys/contrib/dev/uath/ar5523.bin.uu >
${.TARGET}
+ar5523.bin: ${SRCTOP}/sys/contrib/dev/uath/ar5523.bin.uu
+ uudecode -p ${.ALLSRC} > ${.TARGET}
.include <bsd.prog.mk>
Modified: stable/11/usr.sbin/unbound/anchor/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/anchor/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/unbound/anchor/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,9 +1,9 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
-EXPATDIR= ${.CURDIR}/../../../contrib/expat
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
+EXPATDIR= ${SRCTOP}/contrib/expat
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
Modified: stable/11/usr.sbin/unbound/checkconf/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/checkconf/Makefile Tue May 30 04:45:11
2017 (r319190)
+++ stable/11/usr.sbin/unbound/checkconf/Makefile Tue May 30 05:15:09
2017 (r319191)
@@ -1,8 +1,8 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util
${UNBOUNDDIR}/doc
Modified: stable/11/usr.sbin/unbound/control/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/control/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/unbound/control/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,8 +1,8 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util
${UNBOUNDDIR}/doc
Modified: stable/11/usr.sbin/unbound/daemon/Makefile
==============================================================================
--- stable/11/usr.sbin/unbound/daemon/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/unbound/daemon/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,8 +1,8 @@
# $FreeBSD$
# Vendor sources and generated files
-LDNSDIR= ${.CURDIR}/../../../contrib/ldns
-UNBOUNDDIR= ${.CURDIR}/../../../contrib/unbound
+LDNSDIR= ${SRCTOP}/contrib/ldns
+UNBOUNDDIR= ${SRCTOP}/contrib/unbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
Modified: stable/11/usr.sbin/yp_mkdb/Makefile
==============================================================================
--- stable/11/usr.sbin/yp_mkdb/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/yp_mkdb/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,13 +1,13 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv
+.PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv
PROG= yp_mkdb
MAN= yp_mkdb.8
SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c
CFLAGS+= -Dyp_error=warnx
-CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv
+CFLAGS+= -I${SRCTOP}/libexec/ypxfr -I${SRCTOP}/usr.sbin/ypserv
WARNS?= 1
Modified: stable/11/usr.sbin/ypldap/Makefile
==============================================================================
--- stable/11/usr.sbin/ypldap/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ypldap/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -12,8 +12,8 @@ MAN= ypldap.8 ypldap.conf.5
LIBADD= openbsd event util rpcsvc
CFLAGS+=-I${.CURDIR}
-CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent
-CFLAGS+=-I${.CURDIR}/../../lib/libopenbsd
+CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
+CFLAGS+=-I${SRCTOP}/lib/libopenbsd
WARNS= 2
Modified: stable/11/usr.sbin/yppush/Makefile
==============================================================================
--- stable/11/usr.sbin/yppush/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/yppush/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,8 +1,7 @@
# $FreeBSD$
-RPCDIR= ${.CURDIR}/../../include/rpcsvc
-.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \
- ${.CURDIR}/../../libexec/ypxfr
+RPCDIR= ${SRCTOP}/include/rpcsvc
+.PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr
PROG= yppush
MAN= yppush.8
@@ -10,7 +9,7 @@ SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_mi
${GENSRCS}
GENSRCS=yp.h yp_clnt.c yppush_svc.c
-CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr
+CFLAGS+= -I. -I${SRCTOP}/libexec/ypxfr
WARNS?= 2
Modified: stable/11/usr.sbin/ypserv/Makefile
==============================================================================
--- stable/11/usr.sbin/ypserv/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/ypserv/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,9 +2,8 @@
.include <src.opts.mk>
-RPCDIR= ${.CURDIR}/../../include/rpcsvc
-.PATH: ${RPCDIR} \
- ${.CURDIR}/common
+RPCDIR= ${SRCTOP}/include/rpcsvc
+.PATH: ${RPCDIR} ${.CURDIR}/common
PROG= ypserv
MAN= ypserv.8 ypinit.8
Modified: stable/11/usr.sbin/zic/Makefile.inc
==============================================================================
--- stable/11/usr.sbin/zic/Makefile.inc Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/zic/Makefile.inc Tue May 30 05:15:09 2017
(r319191)
@@ -1,3 +1,3 @@
# $FreeBSD$
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${SRCTOP}/usr.sbin/Makefile.inc"
Modified: stable/11/usr.sbin/zic/zdump/Makefile
==============================================================================
--- stable/11/usr.sbin/zic/zdump/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/zic/zdump/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
+.PATH: ${SRCTOP}/contrib/tzcode/zic
PROG= zdump
MAN= zdump.8
@@ -8,7 +8,7 @@ SRCS= zdump.c ialloc.c scheck.c
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
+CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime
WARNS?= 2
Modified: stable/11/usr.sbin/zic/zic/Makefile
==============================================================================
--- stable/11/usr.sbin/zic/zic/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/zic/zic/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
+.PATH: ${SRCTOP}/contrib/tzcode/zic
PROG= zic
MAN= zic.8
@@ -9,7 +9,7 @@ SRCS= zic.c ialloc.c scheck.c
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"${SHAREDIR}/zoneinfo\" -Demkdir=mkdir
CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
+CFLAGS+= -I${.CURDIR:H} -I${SRCTOP}/contrib/tzcode/stdtime
WARNS?= 2
Modified: stable/11/usr.sbin/zonectl/Makefile
==============================================================================
--- stable/11/usr.sbin/zonectl/Makefile Tue May 30 04:45:11 2017
(r319190)
+++ stable/11/usr.sbin/zonectl/Makefile Tue May 30 05:15:09 2017
(r319191)
@@ -2,7 +2,7 @@
PROG= zonectl
SRCS= zonectl.c
-SDIR= ${.CURDIR}/../../sys
+SDIR= ${SRCTOP}/sys
LIBADD= cam sbuf util
MAN= zonectl.8
CFLAGS+=-g -O0
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
