diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-30 15:13:18 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-30 15:13:18 +0000 |
| commit | aeffa88e8a4df5f16e1ca1e5971353bcea1a20f5 (patch) | |
| tree | b73bd6f449b485f0111438d13a31791e4491f3dd /share/mk/src.libnames.mk | |
| parent | dc368d812a1d307a439e0a5823d4695d16c98c45 (diff) | |
| download | FreeBSD-src-aeffa88e8a4df5f16e1ca1e5971353bcea1a20f5.zip FreeBSD-src-aeffa88e8a4df5f16e1ca1e5971353bcea1a20f5.tar.gz | |
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.
Diffstat (limited to 'share/mk/src.libnames.mk')
| -rw-r--r-- | share/mk/src.libnames.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index bfb235c..e8c6dd2 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 \ |
