summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2015-05-30 15:13:18 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2015-05-30 15:13:18 +0000
commit6332aaacb48c35b6c243b7caf18ddae3a027fd46 (patch)
treeb73bd6f449b485f0111438d13a31791e4491f3dd
parent883e6bfbb15f5e5e3ee832e3823a8eda4f1977e4 (diff)
Notes
-rw-r--r--share/mk/src.libnames.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index bfb235c46656..e8c6dd236245 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -9,8 +9,12 @@
.include <src.opts.mk>
-ROOTSRCDIR= ${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H}
-ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${ROOTSRCDIR}
+.if ${.OBJDIR:S,${.CURDIR},,} != ${.OBJDIR}
+ROOTOBJDIR= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP}
+.elif defined(OBJTOP) && ${.OBJDIR:M${OBJTOP}*} != ""
+ROOTOBJDIR= ${OBJTOP}
+.endif
+
_PRIVATELIBS= \
atf_c \
atf_cxx \