From bb8cd0c6f0b1108a77bc466d4d092a4af9ad14d8 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 19:13:32 +0000
Subject: [PATCH] META MODE: Revert r287879 so that 'make -V' still uses
 AUTO_OBJ.

This has caused much confusion for myself as there are quite a lot of
variables that depend on having a proper ${.OBJDIR}.

Sponsored by:	EMC / Isilon Storage Division
---
 share/mk/sys.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 6b6f8477a30..ff753f44b75 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -51,11 +51,9 @@ __ENV_ONLY_OPTIONS:= \
 .endif
 .if ${MK_AUTO_OBJ} == "yes"
 # This needs to be done early - before .PATH is computed
-# Don't do this if just running 'make -V' (but do when inspecting .OBJDIR) or
-# 'make showconfig' (during makeman which enables all options when meta mode
-# is not expected)
-.if (${.MAKEFLAGS:M-V} == "" || ${.MAKEFLAGS:M.OBJDIR} != "") && \
-    !make(showconfig)
+# Don't do this for 'make showconfig' as it enables all options where meta mode
+# is not expected.
+.if !make(showconfig)
 .sinclude <auto.obj.mk>
 .endif
 .endif