svn commit: r307800 - in head/usr.sbin/amd: . amd libamu

[Cy Schubert]

Author: cy
Date: Sat Oct 22 22:27:51 2016
New Revision: 307800
URL: https://svnweb.freebsd.org/changeset/base/307800

Log:
  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.
  
  MFC after:	2 weeks

Modified:
  head/usr.sbin/amd/Makefile.inc
  head/usr.sbin/amd/amd/Makefile
  head/usr.sbin/amd/libamu/Makefile

Modified: head/usr.sbin/amd/Makefile.inc
==============================================================================
--- head/usr.sbin/amd/Makefile.inc	Sat Oct 22 21:51:58 2016	(r307799)
+++ head/usr.sbin/amd/Makefile.inc	Sat Oct 22 22:27:51 2016	(r307800)
@@ -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
 

Modified: head/usr.sbin/amd/amd/Makefile
==============================================================================
--- head/usr.sbin/amd/amd/Makefile	Sat Oct 22 21:51:58 2016	(r307799)
+++ head/usr.sbin/amd/amd/Makefile	Sat Oct 22 22:27:51 2016	(r307800)
@@ -25,7 +25,7 @@ SRCS+=	ops_unionfs.c opts.c readdir.c re
 SRCS+=	srvr_amfs_auto.c srvr_nfs.c
 
 CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
-	 -I${DESTDIR}/usr/include/rpcsvc
+	 -I${.OBJDIR}/../../../include/rpcsvc
 
 LIBADD=	amu wrap
 

Modified: head/usr.sbin/amd/libamu/Makefile
==============================================================================
--- head/usr.sbin/amd/libamu/Makefile	Sat Oct 22 21:51:58 2016	(r307799)
+++ head/usr.sbin/amd/libamu/Makefile	Sat Oct 22 22:27:51 2016	(r307800)
@@ -23,7 +23,7 @@ SRCS+=		nfs_prot_x.c xdr_func_%undef.c
 CLEANFILES+=	nfs_prot_x.c xdr_func_%undef.c
 
 CFLAGS+= -I${SRCTOP}/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}