Index: head/usr.bin/kdump/Makefile
===================================================================
--- head/usr.bin/kdump/Makefile	(revision 284267)
+++ head/usr.bin/kdump/Makefile	(revision 284268)
@@ -1,52 +1,52 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .PATH: ${.CURDIR}/../ktrace
 
 PROG=		kdump
 SRCS=		kdump_subr.c kdump.c ioctl.c subr.c
 DPSRCS=		kdump_subr.h
 CFLAGS+=	-I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
 
 .if ${MK_CASPER} != "no"
 LIBADD=	capsicum
 CFLAGS+=-DHAVE_LIBCAPSICUM
 .endif
 
 .if ${MK_PF} != "no"
 CFLAGS+=-DPF
 .endif
 
 NO_WERROR?=	YES
 
 CLEANFILES=	ioctl.c kdump_subr.c kdump_subr.h
 
 .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
 CLEANFILES+=	linux_syscalls.c
 .endif
 .if (${MACHINE_ARCH} == "amd64")
 CLEANFILES+=	linux32_syscalls.c
 .endif
 
 ioctl.c: mkioctls
 	env MACHINE=${MACHINE} CPP="${CPP}" \
-	    sh ${.CURDIR}/mkioctls print ${DESTDIR}/usr/include > ${.TARGET}
+	    sh ${.CURDIR}/mkioctls print ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 kdump_subr.h: mksubr
-	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include | \
+	sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} | \
 	    sed -n 's/^\([a-z].*)\)$$/void \1;/p' >${.TARGET}
 
 kdump_subr.c: mksubr kdump_subr.h
-	sh ${.CURDIR}/mksubr ${DESTDIR}/usr/include >${.TARGET}
+	sh ${.CURDIR}/mksubr ${DESTDIR}${INCLUDEDIR} >${.TARGET}
 .if (${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386")
 	sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
 	    ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux/syscalls.master ${.CURDIR}/linux_syscalls.conf
 .endif
 .if (${MACHINE_ARCH} == "amd64")
 	sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \
 	    ${.CURDIR}/../../sys/${MACHINE_ARCH}/linux32/syscalls.master ${.CURDIR}/linux32_syscalls.conf
 .endif
 
 .include <bsd.prog.mk>
Index: head/usr.bin/truss/Makefile
===================================================================
--- head/usr.bin/truss/Makefile	(revision 284267)
+++ head/usr.bin/truss/Makefile	(revision 284268)
@@ -1,75 +1,75 @@
 # $FreeBSD$
 
 NO_WERROR=
 PROG=	truss
 SRCS=	main.c setup.c syscalls.c syscalls.h ioctl.c
 
 .if exists(${.CURDIR}/${MACHINE_ARCH}-fbsd.c)
 SRCS+= ${MACHINE_ARCH}-fbsd.c
 .else
 SRCS+= ${MACHINE_CPUARCH}-fbsd.c
 .endif
 
 CFLAGS+= -I${.CURDIR} -I.
 CLEANFILES= syscalls.master syscalls.h ioctl.c
 
 .SUFFIXES: .master
 
 syscalls.master:	${.CURDIR}/../../sys/kern/syscalls.master
 	cat ${.ALLSRC} > syscalls.master
 
 syscalls.h:	syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh syscalls.master \
 		${.CURDIR}/i386.conf
 
 ioctl.c: ${.CURDIR}/../kdump/mkioctls
 	env MACHINE=${MACHINE} CPP="${CPP}" \
-		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}/usr/include > ${.TARGET}
+		/bin/sh ${.CURDIR}/../kdump/mkioctls return ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "i386"
 SRCS+=	i386-linux.c linux_syscalls.h
 CLEANFILES+=i386l-syscalls.master linux_syscalls.h
 
 i386l-syscalls.master:	${.CURDIR}/../../sys/i386/linux/syscalls.master
 	cat ${.ALLSRC} > ${.TARGET}
 
 linux_syscalls.h:	i386l-syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \
 		${.CURDIR}/i386linux.conf
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
 SRCS+=	amd64-linux32.c linux32_syscalls.h
 CLEANFILES+=amd64l32-syscalls.master linux32_syscalls.h
 
 amd64l32-syscalls.master: ${.CURDIR}/../../sys/amd64/linux32/syscalls.master
 	cat ${.ALLSRC} > ${.TARGET}
 
 linux32_syscalls.h:	amd64l32-syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \
 		${.CURDIR}/amd64linux32.conf
 
 SRCS+=	amd64-fbsd32.c freebsd32_syscalls.h
 CLEANFILES+=fbsd32-syscalls.master freebsd32_syscalls.h
 
 fbsd32-syscalls.master: ${.CURDIR}/../../sys/compat/freebsd32/syscalls.master
 	cat ${.ALLSRC} > ${.TARGET}
 
 freebsd32_syscalls.h:	fbsd32-syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \
 		${.CURDIR}/fbsd32.conf
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 SRCS+=	powerpc-fbsd.c freebsd32_syscalls.h
 CLEANFILES+=fbsd32-syscalls.master freebsd32_syscalls.h
 
 fbsd32-syscalls.master: ${.CURDIR}/../../sys/compat/freebsd32/syscalls.master
 	cat ${.ALLSRC} > ${.TARGET}
 
 freebsd32_syscalls.h:	fbsd32-syscalls.master
 	/bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh ${.ALLSRC} \
 		${.CURDIR}/fbsd32.conf
 .endif
 
 .include <bsd.prog.mk>