svn commit: r257056 - head

[Glen Barber]

Author: gjb
Date: Thu Oct 24 15:00:19 2013
New Revision: 257056
URL: http://svnweb.freebsd.org/changeset/base/257056

Log:
  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)

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Oct 24 14:15:05 2013	(r257055)
+++ head/Makefile.inc1	Thu Oct 24 15:00:19 2013	(r257056)
@@ -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