diff options
| author | gjb <gjb@FreeBSD.org> | 2013-10-24 15:00:19 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-10-24 15:00:19 +0000 |
| commit | fbca6d28fb130d20c630447b639577bf327e9d56 (patch) | |
| tree | 00f4ae6dd6c8bd6d354e2b37ac99a02add5ebf5a /Makefile.inc1 | |
| parent | f39a6155780960054a2a51aff43e102ab9058c7b (diff) | |
| download | FreeBSD-src-fbca6d28fb130d20c630447b639577bf327e9d56.zip FreeBSD-src-fbca6d28fb130d20c630447b639577bf327e9d56.tar.gz | |
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)
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 3c1c458..b205f54 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 |
