Date: Thu, 8 Nov 2012 21:27:46 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242789 - in projects/bmake/usr.bin: kdump truss Message-ID: <201211082127.qA8LRkbC026822@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sjg Date: Thu Nov 8 21:27:46 2012 New Revision: 242789 URL: http://svnweb.freebsd.org/changeset/base/242789 Log: If we are staging, we need to look in the right place, for the headers we want to examine. Modified: projects/bmake/usr.bin/kdump/Makefile projects/bmake/usr.bin/truss/Makefile Modified: projects/bmake/usr.bin/kdump/Makefile ============================================================================== --- projects/bmake/usr.bin/kdump/Makefile Thu Nov 8 21:24:17 2012 (r242788) +++ projects/bmake/usr.bin/kdump/Makefile Thu Nov 8 21:27:46 2012 (r242789) @@ -22,14 +22,14 @@ CLEANFILES= ioctl.c kdump_subr.c kdump_s 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} linux_syscalls.c: /bin/sh ${.CURDIR}/../../sys/kern/makesyscalls.sh \ @@ -38,3 +38,9 @@ linux_syscalls.c: >> linux_syscalls.c .include <bsd.prog.mk> + +.if ${MK_STAGING} != "" +# we are interested in the files put in ${STAGE_OBJTOP}/include +DESTDIR= ${STAGE_OBJTOP} +INCLUDEDIR= /include +.endif Modified: projects/bmake/usr.bin/truss/Makefile ============================================================================== --- projects/bmake/usr.bin/truss/Makefile Thu Nov 8 21:24:17 2012 (r242788) +++ projects/bmake/usr.bin/truss/Makefile Thu Nov 8 21:27:46 2012 (r242789) @@ -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 @@ -73,3 +73,10 @@ freebsd32_syscalls.h: fbsd32-syscalls.ma .endif .include <bsd.prog.mk> + + +.if ${MK_STAGING} != "" +# we are interested in the files put in ${STAGE_OBJTOP}/include +DESTDIR= ${STAGE_OBJTOP} +INCLUDEDIR= /include +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211082127.qA8LRkbC026822>