Author: sjg
Date: Sat May 30 15:13:18 2015
New Revision: 283768
URL: https://svnweb.freebsd.org/changeset/base/283768
Log:
Use SRCTOP when defining ROOTOBJDIR
Excplicitly check rather than assume that .CURDIR is
a component of .OBJDIR
Otherwise check for OBJTOP and if that is a match use it.
Modified:
head/share/mk/src.libnames.mk
Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk Sat May 30 15:08:52 2015
(r283767)
+++ head/share/mk/src.libnames.mk Sat May 30 15:13:18 2015
(r283768)
@@ -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 \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
