svn commit: r316950 - head/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Sat Apr 15 01:52:49 2017
New Revision: 316950
URL: https://svnweb.freebsd.org/changeset/base/316950

Log:
  Update to latest, handle case of __objdir=obj

Modified:
  head/share/mk/auto.obj.mk

Modified: head/share/mk/auto.obj.mk
==============================================================================
--- head/share/mk/auto.obj.mk	Sat Apr 15 01:44:45 2017	(r316949)
+++ head/share/mk/auto.obj.mk	Sat Apr 15 01:52:49 2017	(r316950)
@@ -58,7 +58,10 @@ __objdir_made != echo ${__objdir}/; umas
 # This causes make to use the specified directory as .OBJDIR
 .OBJDIR: ${__objdir}
 .if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != ""
+# watch out for __objdir being relative path
+.if !(${__objdir:M/*} == "" && ${.OBJDIR:tA} == ${${.CURDIR}/${__objdir}:L:tA})
 .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
 .endif
 .endif
 .endif
+.endif