svn commit: r286746 - stable/10

Glen Barber gjb at FreeBSD.org
Thu Aug 13 22:29:27 UTC 2015


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}


More information about the svn-src-all mailing list