svn commit: r284263 - projects/bmake/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Thu Jun 11 13:53:15 2015
New Revision: 284263
URL: https://svnweb.freebsd.org/changeset/base/284263

Log:
  With MK_AUTO_OBJ=yes objdir is created during sys.mk
  
  If a makefile sets NO_OBJ, we should honor that by setting
  .OBJDIR back to .CURDIR

Modified:
  projects/bmake/share/mk/bsd.obj.mk

Modified: projects/bmake/share/mk/bsd.obj.mk
==============================================================================
--- projects/bmake/share/mk/bsd.obj.mk	Thu Jun 11 13:51:52 2015	(r284262)
+++ projects/bmake/share/mk/bsd.obj.mk	Thu Jun 11 13:53:15 2015	(r284263)
@@ -47,6 +47,10 @@ __<bsd.obj.mk>__:
 objwarn:
 obj:
 CANONICALOBJDIR= ${.OBJDIR}
+.if defined(NO_OBJ)
+# but this makefile does not want it!
+.OBJDIR: ${.CURDIR}
+.endif
 .elif defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""