From owner-svn-src-projects@FreeBSD.ORG  Wed Feb 20 00:13:27 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 225E7F0D;
 Wed, 20 Feb 2013 00:13:27 +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 1553E276;
 Wed, 20 Feb 2013 00:13:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1K0DQ7i045754;
 Wed, 20 Feb 2013 00:13:26 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1K0DQE3045752;
 Wed, 20 Feb 2013 00:13:26 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201302200013.r1K0DQE3045752@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 20 Feb 2013 00:13:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r247015 - in projects/bmake: share/mk usr.bin/top
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 &quot; projects&quot;
 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: Wed, 20 Feb 2013 00:13:27 -0000

Author: sjg
Date: Wed Feb 20 00:13:26 2013
New Revision: 247015
URL: http://svnweb.freebsd.org/changeset/base/247015

Log:
  Do no assume ${DESTDIR}/usr/include is always valid

Modified:
  projects/bmake/share/mk/local.sys.mk
  projects/bmake/usr.bin/top/Makefile

Modified: projects/bmake/share/mk/local.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.sys.mk	Tue Feb 19 23:57:39 2013	(r247014)
+++ projects/bmake/share/mk/local.sys.mk	Wed Feb 20 00:13:26 2013	(r247015)
@@ -163,6 +163,7 @@ CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILE
 CFLAGS_LAST+= --sysroot=${STAGE_OBJTOP} -isystem ${STAGE_OBJTOP}/include
 .endif
 .endif
+STAGED_INCLUDE_DIR= ${STAGE_OBJTOP}/include
 .if ${USE_META:Uyes} == "yes"
 .include "meta.sys.mk"
 .endif

Modified: projects/bmake/usr.bin/top/Makefile
==============================================================================
--- projects/bmake/usr.bin/top/Makefile	Tue Feb 19 23:57:39 2013	(r247014)
+++ projects/bmake/usr.bin/top/Makefile	Wed Feb 20 00:13:26 2013	(r247015)
@@ -26,7 +26,8 @@ LDADD=	-ltermcap -lm -lkvm
 
 CLEANFILES= sigdesc.h
 SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk
-SIGNAL_H= ${DESTDIR}/usr/include/sys/signal.h
+STAGED_INCLUDE_DIR?= ${DESTDIR}/usr/include
+SIGNAL_H= ${STAGED_INCLUDE_DIR}/sys/signal.h
 sigdesc.h: ${SIGCONV_AWK} ${SIGNAL_H}
 	awk -f ${SIGCONV_AWK} < ${SIGNAL_H} > ${.TARGET}