From 5fe646bf30efb481b8410f525dd916b2c189bd7a Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Tue, 29 Jan 2013 00:11:21 +0000
Subject: Use STAGE_OBJTOP for STAGE_SYMLINKS_DIR etc

---
 share/mk/local.sys.mk | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'share/mk/local.sys.mk')

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"
-- 
cgit v1.1