From 728d82cdd2d12ab8fb353435b19c55697c8fd57c Mon Sep 17 00:00:00 2001 From: "Simon J. Gerraty" Date: Thu, 11 Jun 2015 14:25:53 +0000 Subject: [PATCH] Use INCLUDEDIR rather than hard coded /usr/include Differential Revision: D2748 Reviewed by: brooks imp --- usr.bin/kdump/Makefile | 6 +++--- usr.bin/truss/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index 78a176302530..3dbab6b2d643 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -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 diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile index a5eff14e5d50..34a6ef449291 100644 --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -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