Date: Thu, 16 Jul 2020 20:44:04 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r363261 - projects/release-git Message-ID: <202007162044.06GKi4uA091919@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007162044.06GKi4uA091919>