Author: cy
Date: Sat Nov 5 17:02:38 2016
New Revision: 308346
URL: https://svnweb.freebsd.org/changeset/base/308346
Log:
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.
Modified:
stable/9/usr.sbin/amd/Makefile.inc
stable/9/usr.sbin/amd/amd/Makefile
stable/9/usr.sbin/amd/libamu/Makefile
Directory Properties:
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/amd/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/10/usr.sbin/amd/Makefile.inc
stable/10/usr.sbin/amd/amd/Makefile
stable/10/usr.sbin/amd/libamu/Makefile
stable/11/usr.sbin/amd/Makefile.inc
stable/11/usr.sbin/amd/amd/Makefile
stable/11/usr.sbin/amd/libamu/Makefile
Directory Properties:
stable/10/ (props changed)
stable/11/ (props changed)
Modified: stable/9/usr.sbin/amd/Makefile.inc
==============================================================================
--- stable/9/usr.sbin/amd/Makefile.inc Sat Nov 5 16:30:42 2016
(r308345)
+++ stable/9/usr.sbin/amd/Makefile.inc Sat Nov 5 17:02:38 2016
(r308346)
@@ -37,8 +37,8 @@ LIBAMUDIR= ${.CURDIR}/../libamu
LIBAMU= ${LIBAMUDIR}/libamu.a
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= ${.CURDIR}/../../../include/rpcsvc/mount.x
+NFS_PROT_X= ${.CURDIR}/../../../include/rpcsvc/nfs_prot.x
WARNS?= 1
Modified: stable/9/usr.sbin/amd/amd/Makefile
==============================================================================
--- stable/9/usr.sbin/amd/amd/Makefile Sat Nov 5 16:30:42 2016
(r308345)
+++ stable/9/usr.sbin/amd/amd/Makefile Sat Nov 5 17:02:38 2016
(r308346)
@@ -25,14 +25,14 @@ SRCS+= ops_unionfs.c opts.c readdir.c re
SRCS+= srvr_amfs_auto.c srvr_nfs.c
CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \
- -I${DESTDIR}/usr/include/rpcsvc
+ -I${.OBJDIR}/../../../include/rpcsvc
DPADD= ${LIBAMU} ${LIBWRAP}
LDADD= ${LIBAMU} -lwrap
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
Modified: stable/9/usr.sbin/amd/libamu/Makefile
==============================================================================
--- stable/9/usr.sbin/amd/libamu/Makefile Sat Nov 5 16:30:42 2016
(r308345)
+++ stable/9/usr.sbin/amd/libamu/Makefile Sat Nov 5 17:02:38 2016
(r308346)
@@ -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}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
