From 4cc6b8394f5e639f942efca8d057fa7cad9be235 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 10 Jun 2015 18:09:05 +0000
Subject: [PATCH] If MK_AUTO_OBJ==yes, it is done before bsd.obj.mk included

---
 share/mk/bsd.obj.mk | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index b87b4243314..00408cb6aee 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -42,7 +42,12 @@
 __<bsd.obj.mk>__:
 .include <bsd.own.mk>
 
-.if defined(MAKEOBJDIRPREFIX)
+.if ${MK_AUTO_OBJ} == "yes"
+# it is done by now
+objwarn:
+obj:
+CANONICALOBJDIR= ${.OBJDIR}
+.elif defined(MAKEOBJDIRPREFIX)
 CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
 .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""
 CANONICALOBJDIR:=${MAKEOBJDIR}
@@ -50,15 +55,6 @@ CANONICALOBJDIR:=${MAKEOBJDIR}
 CANONICALOBJDIR:=/usr/obj${.CURDIR}
 .endif
 
-.if defined(.PARSEDIR) && !defined(NO_OBJ) && !defined(NO_AUTO_OBJ)
-.if ${MK_AUTO_OBJ} == "yes"
-__objdir?= ${CANONICALOBJDIR}
-# this is what auto.obj.mk wants to see
-MKOBJDIRS=auto
-.include "auto.obj.mk"
-.endif
-.endif
-
 #
 # Warn of unorthodox object directory.
 #