svn commit: r247015 - in projects/bmake: share/mk usr.bin/top

[Simon J. Gerraty]

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}