diff options
author | sjg <sjg@FreeBSD.org> | 2013-01-29 00:11:21 +0000 |
---|---|---|
committer | sjg <sjg@FreeBSD.org> | 2013-01-29 00:11:21 +0000 |
commit | 5fe646bf30efb481b8410f525dd916b2c189bd7a (patch) | |
tree | 4f5a58525444587a1f153c936b4c80025bb50faa /share | |
parent | 80fef2e8b8f1b4011d2ebdceaacefcf5428321e0 (diff) | |
download | FreeBSD-src-5fe646bf30efb481b8410f525dd916b2c189bd7a.zip FreeBSD-src-5fe646bf30efb481b8410f525dd916b2c189bd7a.tar.gz |
Use STAGE_OBJTOP for STAGE_SYMLINKS_DIR etc
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/local.sys.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/share/mk/local.sys.mk b/share/mk/local.sys.mk index ff8f20b..d136201 100644 --- a/share/mk/local.sys.mk +++ b/share/mk/local.sys.mk @@ -94,11 +94,15 @@ WITH_AUTO_OBJ= yes .include <auto.obj.mk> .endif +# the logic in bsd.own.mk forces this dance .ifndef WITHOUT_META_MODE WITH_META_MODE= yes .ifndef WITHOUT_STAGING WITH_STAGING= yes +.ifndef WITHOUT_STAGING_PROG +WITH_STAGING_PROG= yes +.endif .endif PYTHON ?= /usr/local/bin/python @@ -134,6 +138,8 @@ STAGE_HOST_OBJTOP= ${STAGE_ROOT}/${HOST_TARGET} STAGE_LIBDIR= ${STAGE_OBJTOP}${LIBDIR:U/lib} # this is not the same as INCLUDEDIR STAGE_INCSDIR= ${STAGE_OBJTOP}${INCSDIR:U/include} +# the target is usually an absolute path +STAGE_SYMLINKS_DIR= ${STAGE_OBJTOP} .ifndef WITH_SYSROOT .if ${MACHINE} != "host" |