diff options
author | sjg <sjg@FreeBSD.org> | 2013-02-20 00:13:26 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-02-20 00:13:26 +0000 |
commit | 314150ce465c0a58bb5c79c7113f316f59da2e66 (patch) | |
tree | 5d1d9071b7df1c089f32159d0e83f22e677cf25c | |
parent | 7cd9e7b8e13d06d47d8dd94b3d5e9ff8ac0e7a22 (diff) | |
download | FreeBSD-src-314150ce465c0a58bb5c79c7113f316f59da2e66.zip FreeBSD-src-314150ce465c0a58bb5c79c7113f316f59da2e66.tar.gz |
Do no assume ${DESTDIR}/usr/include is always valid
-rw-r--r-- | share/mk/local.sys.mk | 1 | ||||
-rw-r--r-- | usr.bin/top/Makefile | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index f366328..d10076c 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 864473f..977b3c3 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} |