diff options
| author | gjb <gjb@FreeBSD.org> | 2016-04-18 19:27:51 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-04-18 19:27:51 +0000 |
| commit | 646427c19fa818a4d7c4f823760a9397fd5a6b28 (patch) | |
| tree | 5bb36209a511d0a5757ed19a4d3fcecee8fc6938 | |
| parent | b7c3d323ffd5d59babf16df880eab310da2f6e91 (diff) | |
| download | FreeBSD-src-646427c19fa818a4d7c4f823760a9397fd5a6b28.zip FreeBSD-src-646427c19fa818a4d7c4f823760a9397fd5a6b28.tar.gz | |
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
| -rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index aadcc36..a511582 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -195,8 +195,8 @@ VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE .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*} |
