From 44c38c2ca39caf1798520010dda73b504cdfe761 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 24 Oct 2013 15:00:19 +0000
Subject: [PATCH] Revert r256921 to prevent error output when in the wrong
 directory. This should have been reverted with the stable/10/Makefile.inc1
 revert, but apparently my commit did not go through.

Discussed with:	cperciva (originally)
---
 Makefile.inc1 | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 3c1c458b679..b205f541f3c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -128,11 +128,8 @@ OSRELDATE=	0
 .endif
 
 .if !defined(VERSION)
-REVISION!=	make -C ${.CURDIR}/release -V REVISION
-BRANCH!=	make -C ${.CURDIR}/release -V BRANCH
-SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
-		${.CURDIR}/sys/sys/param.h
-VERSION=	FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE}
+VERSION!=	uname -srp
+VERSION+=	${OSRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64