From 3dd30bd184e99ee5805c0c5609a25d36301deaef Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Wed, 14 Sep 2016 01:47:01 +0000 Subject: [PATCH] Switch from .CURDIR to the simpler, more legible SRCTOP. Suggested by: emaste X-MFC-with: upcoming amd upgrade --- usr.sbin/amd/amd/Makefile | 4 ++-- usr.sbin/amd/amq/Makefile | 4 ++-- usr.sbin/amd/fixmount/Makefile | 4 ++-- usr.sbin/amd/fsinfo/Makefile | 4 ++-- usr.sbin/amd/hlfsd/Makefile | 4 ++-- usr.sbin/amd/include/Makefile | 2 +- usr.sbin/amd/libamu/Makefile | 12 ++++++------ usr.sbin/amd/mk-amd-map/Makefile | 2 +- usr.sbin/amd/pawd/Makefile | 4 ++-- usr.sbin/amd/scripts/Makefile | 2 +- usr.sbin/amd/wire-test/Makefile | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index df929080f232..1ebd9b71c000 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -8,7 +8,7 @@ .include -.PATH: ${.CURDIR}/../../../contrib/amd/amd +.PATH: ${SRCTOP}/contrib/amd/amd PROG= amd MAN= amd.8 @@ -24,7 +24,7 @@ SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c SRCS+= ops_unionfs.c opts.c readdir.c restart.c rpc_fwd.c sched.c SRCS+= srvr_amfs_auto.c srvr_nfs.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \ +CFLAGS+= -I${SRCTOP}/contrib/amd/amd \ -I${DESTDIR}/usr/include/rpcsvc LIBADD= amu wrap diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile index 968ae4c7b044..a2069705478b 100644 --- a/usr.sbin/amd/amq/Makefile +++ b/usr.sbin/amd/amq/Makefile @@ -6,13 +6,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../contrib/amd/amq +.PATH: ${SRCTOP}/contrib/amd/amq PROG= amq MAN= amq.8 SRCS= amq.c amq_clnt.c amq_xdr.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq +CFLAGS+= -I${SRCTOP}/contrib/amd/amq LIBADD= amu diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile index 8137ffb3fdb7..12deb22ae1dc 100644 --- a/usr.sbin/amd/fixmount/Makefile +++ b/usr.sbin/amd/fixmount/Makefile @@ -5,8 +5,8 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/fixmount \ - ${.CURDIR}/../../../contrib/amd/conf/checkmount +.PATH: ${SRCTOP}/contrib/amd/fixmount \ + ${SRCTOP}/contrib/amd/conf/checkmount PROG= fixmount MAN= fixmount.8 diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index a059da690e43..a3f4ce2a3fab 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/usr.sbin/amd/fsinfo/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo +.PATH: ${SRCTOP}/contrib/amd/fsinfo PROG= fsinfo MAN= fsinfo.8 @@ -13,7 +13,7 @@ SRCS= fsi_gram.y fsi_lex.l SRCS+= fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c SRCS+= wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo +CFLAGS+= -I${SRCTOP}/contrib/amd/fsinfo LIBADD= amu diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile index 96d05c4f17ff..7e82cc148f2d 100644 --- a/usr.sbin/amd/hlfsd/Makefile +++ b/usr.sbin/amd/hlfsd/Makefile @@ -5,13 +5,13 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd +.PATH: ${SRCTOP}/contrib/amd/hlfsd PROG= hlfsd MAN= hlfsd.8 SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd +CFLAGS+= -I${SRCTOP}/contrib/amd/hlfsd LIBADD= amu diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile index db70b6e2e6cb..8afc1971f8bb 100644 --- a/usr.sbin/amd/include/Makefile +++ b/usr.sbin/amd/include/Makefile @@ -17,7 +17,7 @@ CLEANFILES= ${SRCS} all depend: ${SRCS} -config_local.h: newvers.sh ${.CURDIR}/../../../sys/conf/newvers.sh +config_local.h: newvers.sh ${SRCTOP}/sys/conf/newvers.sh @rm -f ${.TARGET} sh ${.ALLSRC} > ${.TARGET} diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index fa8e3ab942a5..4621f3e93344 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -5,10 +5,10 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/libamu \ - ${.CURDIR}/../../../contrib/amd/conf/transp \ - ${.CURDIR}/../../../contrib/amd/conf/mtab \ - ${.CURDIR}/../../../contrib/amd/conf/umount +.PATH: ${SRCTOP}/contrib/amd/libamu \ + ${SRCTOP}/contrib/amd/conf/transp \ + ${SRCTOP}/contrib/amd/conf/mtab \ + ${SRCTOP}/contrib/amd/conf/umount LIB= amu INTERNALLIB= @@ -22,13 +22,13 @@ SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c SRCS+= nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \ +CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \ -I${DESTDIR}/usr/include/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} -XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' +XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' xdr_func_%undef.c: xdr_func.c -unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET} diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile index 417ea2a85cf1..e7cd959782f2 100644 --- a/usr.sbin/amd/mk-amd-map/Makefile +++ b/usr.sbin/amd/mk-amd-map/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map +.PATH: ${SRCTOP}/contrib/amd/mk-amd-map PROG= mk-amd-map MAN= mk-amd-map.8 diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile index 2870ab4cd833..0d634be9742b 100644 --- a/usr.sbin/amd/pawd/Makefile +++ b/usr.sbin/amd/pawd/Makefile @@ -5,14 +5,14 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/amq +.PATH: ${SRCTOP}/contrib/amd/amq BINDIR= /usr/bin PROG= pawd SRCS= pawd.c amq_clnt.c amq_xdr.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq +CFLAGS+= -I${SRCTOP}/contrib/amd/amq LIBADD= amu diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile index 822b95144916..aaccb41aaba4 100644 --- a/usr.sbin/amd/scripts/Makefile +++ b/usr.sbin/amd/scripts/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/scripts +.PATH: ${SRCTOP}/contrib/amd/scripts MAN= amd.conf.5 diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile index edde2eb67d5b..5382fd71b48c 100644 --- a/usr.sbin/amd/wire-test/Makefile +++ b/usr.sbin/amd/wire-test/Makefile @@ -5,7 +5,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/wire-test +.PATH: ${SRCTOP}/contrib/amd/wire-test PROG= wire-test MAN= wire-test.8