svn commit: r284268 - in head/usr.bin: kdump truss

[Simon J. Gerraty]

Author: sjg
Date: Thu Jun 11 14:25:53 2015
New Revision: 284268
URL: https://svnweb.freebsd.org/changeset/base/284268

Log:
  Use INCLUDEDIR rather than hard coded /usr/include
  
  Differential Revision:	D2748
  Reviewed by:	brooks imp

Modified:
  head/usr.bin/kdump/Makefile
  head/usr.bin/truss/Makefile

Modified: head/usr.bin/kdump/Makefile
==============================================================================
--- head/usr.bin/kdump/Makefile	Thu Jun 11 14:11:41 2015	(r284267)
+++ head/usr.bin/kdump/Makefile	Thu Jun 11 14:25:53 2015	(r284268)
@@ -32,14 +32,14 @@ CLEANFILES+=	linux32_syscalls.c
 
 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

Modified: head/usr.bin/truss/Makefile
==============================================================================
--- head/usr.bin/truss/Makefile	Thu Jun 11 14:11:41 2015	(r284267)
+++ head/usr.bin/truss/Makefile	Thu Jun 11 14:25:53 2015	(r284268)
@@ -24,7 +24,7 @@ syscalls.h:	syscalls.master
 
 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