From 34ce9cc44fbbd7b19853f50d4e7b224e34fc1823 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 20 Feb 2013 00:13:26 +0000
Subject: [PATCH] Do no assume ${DESTDIR}/usr/include is always valid

---
 share/mk/local.sys.mk | 1 +
 usr.bin/top/Makefile  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk
index f3663286340..d10076c3873 100644
--- a/share/mk/local.sys.mk
+++ b/share/mk/local.sys.mk
@@ -163,6 +163,7 @@ CXXFLAGS_LAST += ${CFLAGS_LAST.${COMPILER_TYPE}}
 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
diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile
index 864473f5c61..977b3c3b71b 100644
--- a/usr.bin/top/Makefile
+++ b/usr.bin/top/Makefile
@@ -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}