Index: stable/10/usr.sbin/amd/Makefile.inc =================================================================== --- stable/10/usr.sbin/amd/Makefile.inc (revision 308345) +++ stable/10/usr.sbin/amd/Makefile.inc (revision 308346) @@ -1,47 +1,47 @@ # ex:ts=8 # # $FreeBSD$ # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998. # Portions derived from # $NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ .include CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) CFLAGS+= -I${.OBJDIR}/../include .endif CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include CFLAGS+= -I${.CURDIR}/../../../contrib/amd CFLAGS+= -DHAVE_CONFIG_H .if ${MK_NIS} == "no" CFLAGS+= -DHAVE_LOCALCONFIG_H .endif .if ${MK_HESIOD} != "no" CFLAGS+= -DYES_HESIOD .endif CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" .if exists(${.OBJDIR}/../libamu) LIBAMUDIR= ${.OBJDIR}/../libamu .else LIBAMUDIR= ${.CURDIR}/../libamu .endif 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= ${SRCTOP}/include/rpcsvc/mount.x +NFS_PROT_X= ${SRCTOP}/include/rpcsvc/nfs_prot.x WARNS?= 1 .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif Index: stable/10/usr.sbin/amd/amd/Makefile =================================================================== --- stable/10/usr.sbin/amd/amd/Makefile (revision 308345) +++ stable/10/usr.sbin/amd/amd/Makefile (revision 308346) @@ -1,53 +1,53 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ # .include .PATH: ${.CURDIR}/../../../contrib/amd/amd PROG= amd MAN= amd.8 SRCS= conf_parse.y conf_tok.l SRCS+= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c SRCS+= amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c SRCS+= get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c SRCS+= nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c 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 \ - -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 CLEANFILES+= mount_xdr.c mount_xdr.c: ${MOUNT_X} ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} .if ${MK_HESIOD} != "no" SRCS+= info_hesiod.c CFLAGS+= -DHAVE_MAP_HESIOD .endif .if ${MK_NIS} != "no" SRCS+= info_nis.c .endif .include Index: stable/10/usr.sbin/amd/libamu/Makefile =================================================================== --- stable/10/usr.sbin/amd/libamu/Makefile (revision 308345) +++ stable/10/usr.sbin/amd/libamu/Makefile (revision 308346) @@ -1,36 +1,36 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/libamu \ ${.CURDIR}/../../../contrib/amd/conf/transp \ ${.CURDIR}/../../../contrib/amd/conf/mtab \ ${.CURDIR}/../../../contrib/amd/conf/umount LIB= amu INTERNALLIB= SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ strutil.c wire.c xutil.c # These would be links created by the GNU-style configure SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c # Generated at compile time (replaces supplied xdr_func.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 \ - -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} XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' xdr_func_%undef.c: xdr_func.c -unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET} .include Index: stable/10 =================================================================== --- stable/10 (revision 308345) +++ stable/10 (revision 308346) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r307800-307801 Index: stable/11/usr.sbin/amd/Makefile.inc =================================================================== --- stable/11/usr.sbin/amd/Makefile.inc (revision 308345) +++ stable/11/usr.sbin/amd/Makefile.inc (revision 308346) @@ -1,42 +1,42 @@ # ex:ts=8 # # $FreeBSD$ # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998. # Portions derived from # $NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ .include PACKAGE= amd CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) CFLAGS+= -I${.OBJDIR}/../include .endif CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include CFLAGS+= -I${.CURDIR}/../../../contrib/amd CFLAGS+= -DHAVE_CONFIG_H .if ${MK_NIS} == "no" CFLAGS+= -DHAVE_LOCALCONFIG_H .endif .if ${MK_HESIOD} != "no" CFLAGS+= -DYES_HESIOD .endif 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 .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif Index: stable/11/usr.sbin/amd/amd/Makefile =================================================================== --- stable/11/usr.sbin/amd/amd/Makefile (revision 308345) +++ stable/11/usr.sbin/amd/amd/Makefile (revision 308346) @@ -1,52 +1,52 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ # .include .PATH: ${.CURDIR}/../../../contrib/amd/amd PROG= amd MAN= amd.8 SRCS= conf_parse.y conf_tok.l SRCS+= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c SRCS+= amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c SRCS+= get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c SRCS+= nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c 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 \ - -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 CLEANFILES+= mount_xdr.c mount_xdr.c: ${MOUNT_X} ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} .if ${MK_HESIOD} != "no" SRCS+= info_hesiod.c CFLAGS+= -DHAVE_MAP_HESIOD .endif .if ${MK_NIS} != "no" SRCS+= info_nis.c .endif .include Index: stable/11/usr.sbin/amd/libamu/Makefile =================================================================== --- stable/11/usr.sbin/amd/libamu/Makefile (revision 308345) +++ stable/11/usr.sbin/amd/libamu/Makefile (revision 308346) @@ -1,36 +1,36 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/libamu \ ${.CURDIR}/../../../contrib/amd/conf/transp \ ${.CURDIR}/../../../contrib/amd/conf/mtab \ ${.CURDIR}/../../../contrib/amd/conf/umount LIB= amu INTERNALLIB= SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ strutil.c wire.c xutil.c # These would be links created by the GNU-style configure SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c # Generated at compile time (replaces supplied xdr_func.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 \ - -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} XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' xdr_func_%undef.c: xdr_func.c -unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET} .include Index: stable/11 =================================================================== --- stable/11 (revision 308345) +++ stable/11 (revision 308346) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r307800-307801 Index: stable/9/usr.sbin/amd/Makefile.inc =================================================================== --- stable/9/usr.sbin/amd/Makefile.inc (revision 308345) +++ stable/9/usr.sbin/amd/Makefile.inc (revision 308346) @@ -1,47 +1,47 @@ # ex:ts=8 # # $FreeBSD$ # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998. # Portions derived from # $NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ .include CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) CFLAGS+= -I${.OBJDIR}/../include .endif CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include CFLAGS+= -I${.CURDIR}/../../../contrib/amd CFLAGS+= -DHAVE_CONFIG_H .if ${MK_NIS} == "no" CFLAGS+= -DHAVE_LOCALCONFIG_H .endif .if ${MK_HESIOD} != "no" CFLAGS+= -DYES_HESIOD .endif CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" .if exists(${.OBJDIR}/../libamu) LIBAMUDIR= ${.OBJDIR}/../libamu .else LIBAMUDIR= ${.CURDIR}/../libamu .endif 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 .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif Index: stable/9/usr.sbin/amd/amd/Makefile =================================================================== --- stable/9/usr.sbin/amd/amd/Makefile (revision 308345) +++ stable/9/usr.sbin/amd/amd/Makefile (revision 308346) @@ -1,53 +1,53 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ # .include .PATH: ${.CURDIR}/../../../contrib/amd/amd PROG= amd MAN= amd.8 SRCS= conf_parse.y conf_tok.l SRCS+= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c SRCS+= amfs_host.c amfs_link.c amfs_linkx.c amfs_nfsl.c SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c SRCS+= get_args.c info_exec.c info_file.c info_ndbm.c info_passwd.c SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c SRCS+= nfs_subr.c ops_cdfs.c ops_mfs.c ops_nfs.c ops_nfs3.c 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 \ - -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 CLEANFILES+= mount_xdr.c mount_xdr.c: ${MOUNT_X} ${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} .if ${MK_HESIOD} != "no" SRCS+= info_hesiod.c CFLAGS+= -DHAVE_MAP_HESIOD .endif .if ${MK_NIS} != "no" SRCS+= info_nis.c .endif .include Index: stable/9/usr.sbin/amd/libamu/Makefile =================================================================== --- stable/9/usr.sbin/amd/libamu/Makefile (revision 308345) +++ stable/9/usr.sbin/amd/libamu/Makefile (revision 308346) @@ -1,36 +1,36 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/libamu \ ${.CURDIR}/../../../contrib/amd/conf/transp \ ${.CURDIR}/../../../contrib/amd/conf/mtab \ ${.CURDIR}/../../../contrib/amd/conf/umount LIB= amu INTERNALLIB= SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ strutil.c wire.c xutil.c # These would be links created by the GNU-style configure SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c # Generated at compile time (replaces supplied xdr_func.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 \ - -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} XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${.CURDIR}/../../../contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' xdr_func_%undef.c: xdr_func.c -unifdef ${XDRDEFS} < ${.ALLSRC} > ${.TARGET} .include Index: stable/9/usr.sbin/amd =================================================================== --- stable/9/usr.sbin/amd (revision 308345) +++ stable/9/usr.sbin/amd (revision 308346) Property changes on: stable/9/usr.sbin/amd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/amd:r307800-307801 Index: stable/9/usr.sbin =================================================================== --- stable/9/usr.sbin (revision 308345) +++ stable/9/usr.sbin (revision 308346) Property changes on: stable/9/usr.sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin:r307800-307801