diff options
| author | cy <cy@FreeBSD.org> | 2016-11-05 17:02:38 +0000 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2016-11-05 17:02:38 +0000 |
| commit | eed39e0d3ab490d7b08201f855fc18b44c8e37cf (patch) | |
| tree | 88d60504e29edd8159b751774ebb862a18115dad /usr.sbin | |
| parent | 1a8a4f440751f400a6bb1e43b689f3d9bb5c1f4d (diff) | |
| download | FreeBSD-src-eed39e0d3ab490d7b08201f855fc18b44c8e37cf.zip FreeBSD-src-eed39e0d3ab490d7b08201f855fc18b44c8e37cf.tar.gz | |
MFC r307800, r307801
r307800:
Sources from the "current" build tree and generated sources in the
object tree should be used instead of sources and headers from the
already installed source tree on the build host.
This was noticed while addressing issues in the upcoming amd update.
r307801:
Align whitespace.
r307801 is related to r307800 however it was a separate commit to
HEAD in order to maintain a separation between the functional change
and a correction of style.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/amd/Makefile.inc | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/amd/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/libamu/Makefile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc index 1b19acd..d558fa4 100644 --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -32,8 +32,8 @@ CFLAGS+= -DYES_HESIOD CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x -NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x +MOUNT_X= ${SRCTOP}/include/rpcsvc/mount.x +NFS_PROT_X= ${SRCTOP}/include/rpcsvc/nfs_prot.x WARNS?= 1 diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index 602c941..e1a715d 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -25,13 +25,13 @@ 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 \ - -I${DESTDIR}/usr/include/rpcsvc + -I${.OBJDIR}/../../../include/rpcsvc LIBADD= amu wrap CLEANFILES+= conf_parse.c conf_parse.h conf_tok.c -conf_tok.o: conf_parse.h +conf_tok.o: conf_parse.h # These are generated at compile time SRCS+= mount_xdr.c diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index fa8e3ab..d82a8cf 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -23,7 +23,7 @@ SRCS+= nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu \ - -I${DESTDIR}/usr/include/rpcsvc + -I${.OBJDIR}/../../../include/rpcsvc nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} |
