Date: Wed, 14 Sep 2016 01:47:01 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r305787 - in head/usr.sbin/amd: amd amq fixmount fsinfo hlfsd include libamu mk-amd-map pawd scripts wire-test Message-ID: <201609140147.u8E1l1qh065260@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Wed Sep 14 01:47:01 2016 New Revision: 305787 URL: https://svnweb.freebsd.org/changeset/base/305787 Log: Switch from .CURDIR to the simpler, more legible SRCTOP. Suggested by: emaste X-MFC-with: upcoming amd upgrade Modified: head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/amq/Makefile head/usr.sbin/amd/fixmount/Makefile head/usr.sbin/amd/fsinfo/Makefile head/usr.sbin/amd/hlfsd/Makefile head/usr.sbin/amd/include/Makefile head/usr.sbin/amd/libamu/Makefile head/usr.sbin/amd/mk-amd-map/Makefile head/usr.sbin/amd/pawd/Makefile head/usr.sbin/amd/scripts/Makefile head/usr.sbin/amd/wire-test/Makefile Modified: head/usr.sbin/amd/amd/Makefile ============================================================================== --- head/usr.sbin/amd/amd/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/amd/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -8,7 +8,7 @@ .include <src.opts.mk> -.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 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 Modified: head/usr.sbin/amd/amq/Makefile ============================================================================== --- head/usr.sbin/amd/amq/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/amq/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/fixmount/Makefile ============================================================================== --- head/usr.sbin/amd/fixmount/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/fixmount/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/fsinfo/Makefile ============================================================================== --- head/usr.sbin/amd/fsinfo/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/fsinfo/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/hlfsd/Makefile ============================================================================== --- head/usr.sbin/amd/hlfsd/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/hlfsd/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/include/Makefile ============================================================================== --- head/usr.sbin/amd/include/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/include/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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} Modified: head/usr.sbin/amd/libamu/Makefile ============================================================================== --- head/usr.sbin/amd/libamu/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/libamu/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 umoun 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} Modified: head/usr.sbin/amd/mk-amd-map/Makefile ============================================================================== --- head/usr.sbin/amd/mk-amd-map/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/mk-amd-map/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/pawd/Makefile ============================================================================== --- head/usr.sbin/amd/pawd/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/pawd/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -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 Modified: head/usr.sbin/amd/scripts/Makefile ============================================================================== --- head/usr.sbin/amd/scripts/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/scripts/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/scripts +.PATH: ${SRCTOP}/contrib/amd/scripts MAN= amd.conf.5 Modified: head/usr.sbin/amd/wire-test/Makefile ============================================================================== --- head/usr.sbin/amd/wire-test/Makefile Wed Sep 14 00:00:11 2016 (r305786) +++ head/usr.sbin/amd/wire-test/Makefile Wed Sep 14 01:47:01 2016 (r305787) @@ -5,7 +5,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/wire-test +.PATH: ${SRCTOP}/contrib/amd/wire-test PROG= wire-test MAN= wire-test.8
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609140147.u8E1l1qh065260>