From 646427c19fa818a4d7c4f823760a9397fd5a6b28 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Mon, 18 Apr 2016 19:27:51 +0000
Subject: [PATCH] Add MK_AUTO_OBJ=no to ${MAKE} invocation if PKG_VERSION needs
 to be created to avoid creating ${.OBJDIR}.

The duplicate REVISION/BRANCH/VERSION evaluation will be addressed
separately.

Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index aadcc3623866..a5115822f2ec 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -195,8 +195,8 @@ VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE
 .endif
 
 .if !defined(PKG_VERSION)
-REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
-BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
+REVISION!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION
+BRANCH!=	MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
 		${SRCDIR}/sys/sys/param.h
 .if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*}