svn commit: r363261 - projects/release-git
Glen Barber
gjb at FreeBSD.org
Thu Jul 16 20:44:04 UTC 2020
Author: gjb
Date: Thu Jul 16 20:44:04 2020
New Revision: 363261
URL: https://svnweb.freebsd.org/changeset/base/363261
Log:
Move GIT_CMD a few lines down, so it is not in between SVN_*
lines.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
projects/release-git/Makefile.inc1
Modified: projects/release-git/Makefile.inc1
==============================================================================
--- projects/release-git/Makefile.inc1 Thu Jul 16 20:43:28 2020 (r363260)
+++ projects/release-git/Makefile.inc1 Thu Jul 16 20:44:04 2020 (r363261)
@@ -478,14 +478,6 @@ SVN_CMD= ${_P}/${_S}
. endfor
.export SVN_CMD
.endif
-.if !defined(GIT_CMD) || empty(GIT_CMD)
-. for _P in /usr/bin /usr/local/bin
-. if exists(${_P}/git)
-GIT_CMD= ${_P}/git
-. endif
-. endfor
-.export GIT_CMD
-.endif
SVNFLAGS?= -r HEAD
.if !defined(VCS_REVISION) || empty(VCS_REVISION)
.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD)
@@ -503,6 +495,15 @@ _VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR})
VCS_REVISION= $$(echo r${_VCS_REVISION})
. endif
.export VCS_REVISION
+.endif
+
+.if !defined(GIT_CMD) || empty(GIT_CMD)
+. for _P in /usr/bin /usr/local/bin
+. if exists(${_P}/git)
+GIT_CMD= ${_P}/git
+. endif
+. endfor
+.export GIT_CMD
.endif
.if !defined(OSRELDATE)
More information about the svn-src-projects
mailing list