svn commit: r325560 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Wed Nov  8 18:02:01 2017
New Revision: 325560
URL: https://svnweb.freebsd.org/changeset/base/325560

Log:
  META_MODE: Bmake 20171028 in r325340 simplifies the meta filename.
  
  Now if the meta file is in the objdir, the objdir is stripped away
  from the meta filename.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/bsd.dep.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Wed Nov  8 16:53:11 2017	(r325559)
+++ head/share/mk/bsd.dep.mk	Wed Nov  8 18:02:01 2017	(r325560)
@@ -233,10 +233,14 @@ afterdepend: beforedepend
 # mimicing what bmake's meta_name() does and adding in the full path
 # as well to ensure that the expected meta file is read.
 .if ${__obj:M*/*}
+.if ${MAKE_VERSION} < 20171028
 _meta_obj=	${.OBJDIR:C,/,_,g}_${__obj:C,/,_,g}.meta
 .else
+_meta_obj=	${__obj:C,/,_,g}.meta
+.endif	# ${MAKE_VERSION} < 20171028
+.else
 _meta_obj=	${__obj}.meta
-.endif
+.endif	# ${__obj:M*/*}
 _dep_obj=	${DEPENDFILE}.${__obj:${DEPEND_FILTER}}
 .if defined(_meta_filemon)
 _depfile=	${.OBJDIR}/${_meta_obj}