Date: Thu, 13 Aug 2015 22:29:27 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r286746 - stable/10 Message-ID: <201508132229.t7DMTRie079252@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Aug 13 22:29:26 2015 New Revision: 286746 URL: https://svnweb.freebsd.org/changeset/base/286746 Log: MFC r262670 (marcel): Use ${MAKE} so that we always use the same version/implementation of make(1). PR: 202277 Submitted by: John Hein Sponsored by: The FreeBSD Foundation Modified: stable/10/Makefile.inc1 Directory Properties: stable/10/ (props changed) Modified: stable/10/Makefile.inc1 ============================================================================== --- stable/10/Makefile.inc1 Thu Aug 13 22:04:30 2015 (r286745) +++ stable/10/Makefile.inc1 Thu Aug 13 22:29:26 2015 (r286746) @@ -133,8 +133,8 @@ OSRELDATE= 0 .endif .if !defined(VERSION) -REVISION!= make -C ${SRCDIR}/release -V REVISION -BRANCH!= make -C ${SRCDIR}/release -V BRANCH +REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION +BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${SRCDIR}/sys/sys/param.h VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508132229.t7DMTRie079252>