git: ae39c0b6bc37 - stable/13 - Makefile.inc1: Silence an error in make packages
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 07 Dec 2021 07:45:21 UTC
The branch stable/13 has been updated by otis (ports committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=ae39c0b6bc3773333e18d5009c69826b8e78fe5b
commit ae39c0b6bc3773333e18d5009c69826b8e78fe5b
Author: Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-11-28 20:44:13 +0000
Commit: Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-12-07 07:43:51 +0000
Makefile.inc1: Silence an error in make packages
Silence an error in "packages" target, like:
eval: /usr/src: Permission denied
on systems without subversion present.
Reviewed by: emaste
Approved by: emaste
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D33153
(cherry picked from commit aaa4cd7f3c933950582dfb4f0eac23a200dafe53)
---
Makefile.inc1 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index c18c92d3cd38..b2ea58f02b1d 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -502,11 +502,13 @@ SVNVERSION_CMD?=${_D}/svnliteversion
. endif
. endfor
.endif
+.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD)
_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR})
. if !empty(_VCS_REVISION)
VCS_REVISION= $$(echo r${_VCS_REVISION})
-. endif
.export VCS_REVISION
+. endif
+.endif
.endif
.if !defined(GIT_CMD) || empty(GIT_CMD)