diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2020-08-25 18:30:12 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2020-08-25 18:30:12 +0000 |
| commit | 2b65ed0302f8339db05640c6ee2bed16458c6e4b (patch) | |
| tree | 614d853c93c389709fedba7fdab177d917f36f7a /release/Makefile.inc1 | |
| parent | 64f0728e670f15202dd2390bc33d0ea5c55fbd97 (diff) | |
| download | src-2b65ed0302f8339db05640c6ee2bed16458c6e4b.tar.gz src-2b65ed0302f8339db05640c6ee2bed16458c6e4b.zip | |
Fix the current working directory when setting GITREV and
GITBRANCH.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Notes
Notes:
svn path=/projects/release-git/; revision=364778
Diffstat (limited to 'release/Makefile.inc1')
| -rw-r--r-- | release/Makefile.inc1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile.inc1 b/release/Makefile.inc1 index 7d46f79adabd..3f650f863659 100644 --- a/release/Makefile.inc1 +++ b/release/Makefile.inc1 @@ -16,11 +16,11 @@ GIT_CMD= ${_P}/git # Set the git branch and hash to export where needed. .if !defined(GITBRANCH) || empty(GITBRANCH) -GITBRANCH!= ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' +GITBRANCH!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --abbrev-ref HEAD 2>/dev/null | sed -e 's/\^\///' .export GITBRANCH .endif .if !defined(GITREV) || empty(GITREV) -GITREV!= ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true +GITREV!= cd ${.CURDIR} && ${GIT_CMD} rev-parse --verify --short HEAD 2>/dev/null || true .export GITREV .endif |