From owner-svn-src-projects@FreeBSD.ORG Thu Nov 8 21:27:46 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
by hub.freebsd.org (Postfix) with ESMTP id B2EBAC34;
Thu, 8 Nov 2012 21:27:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 7E5988FC18;
Thu, 8 Nov 2012 21:27:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8LRkZK026824;
Thu, 8 Nov 2012 21:27:46 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8LRkbC026822;
Thu, 8 Nov 2012 21:27:46 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201211082127.qA8LRkbC026822@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 8 Nov 2012 21:27:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242789 - in projects/bmake/usr.bin: kdump truss
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Nov 2012 21:27:46 -0000
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