Date: Mon, 18 Apr 2016 19:27:51 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298222 - head Message-ID: <201604181927.u3IJRpqW081122@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Apr 18 19:27:51 2016 New Revision: 298222 URL: https://svnweb.freebsd.org/changeset/base/298222 Log: Add MK_AUTO_OBJ=no to ${MAKE} invocation if PKG_VERSION needs to be created to avoid creating ${.OBJDIR}. The duplicate REVISION/BRANCH/VERSION evaluation will be addressed separately. Sponsored by: The FreeBSD Foundation Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Mon Apr 18 18:39:43 2016 (r298221) +++ head/Makefile.inc1 Mon Apr 18 19:27:51 2016 (r298222) @@ -195,8 +195,8 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/ .endif .if !defined(PKG_VERSION) -REVISION!= ${MAKE} -C ${SRCDIR}/release -V REVISION -BRANCH!= ${MAKE} -C ${SRCDIR}/release -V BRANCH +REVISION!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V REVISION +BRANCH!= MK_AUTO_OBJ=no ${MAKE} -C ${SRCDIR}/release -V BRANCH SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${SRCDIR}/sys/sys/param.h .if ${BRANCH:MSTABLE*} || ${BRANCH:MCURRENT*}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604181927.u3IJRpqW081122>