diff options
| author |  Tomi Ollila <tomi.ollila@iki.fi> | 2014-05-06 22:35:28 +0300 |
|---|---|---|
| committer |  David Bremner <david@tethera.net> | 2014-07-09 20:24:28 -0300 |
| commit | 6721222ea8e3e8c0de15c5ae6f3ae0e388676c2a (patch) | |
| tree | 863987c977e93decc8ed3a866c8b6a30cfb33519 /Makefile.local | |
| parent | 934e333a08e7f0ef24a3f139dd3d8738d28f1bd5 (diff) | |
build: check .git directory existence in srcdir (for out-of-tree builds)
So that $(VERSION) and version.stamp uses the git-describe -based
version data instead of the content of `version' file.
For consistency also the git commands in Makefile[.local] target
`verify-no-dirty-code' uses the git --git-dir=$srcdir/.git ...
commands (inside ifeq($(IS_GIT),yes)). Attempting to make this
target outside of the tree will fail in any case.
Diffstat (limited to 'Makefile.local')
| -rw-r--r-- | Makefile.local | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.local b/Makefile.local index 3377d55e..d5ee85ce 100644 --- a/Makefile.local +++ b/Makefile.local @@ -10,10 +10,10 @@ # repository), we let git append identification of the actual commit. PACKAGE=notmuch -IS_GIT=$(shell if [ -d .git ] ; then echo yes ; else echo no; fi) +IS_GIT=$(shell if [ -d ${srcdir}/.git ] ; then echo yes ; else echo no; fi) ifeq ($(IS_GIT),yes) -DATE:=$(shell git log --date=short -1 --pretty=format:%cd) +DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd) else DATE:=$(shell date +%F) endif @@ -21,7 +21,7 @@ endif VERSION:=$(shell cat ${srcdir}/version) ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),) ifeq ($(IS_GIT),yes) -VERSION:=$(shell git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/) +VERSION:=$(shell git --git-dir=${srcdir}/.git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/) # Write the file 'version.stamp' in case its contents differ from $(VERSION) FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs) ifneq ($(FILE_VERSION),$(VERSION)) @@ -201,11 +201,11 @@ verify-source-tree-and-version: verify-no-dirty-code verify-no-dirty-code: release-checks ifeq ($(IS_GIT),yes) @printf "Checking that source tree is clean..." -ifneq ($(shell git ls-files -m),) +ifneq ($(shell git --git-dir=${srcdir}/.git ls-files -m),) @echo "No" @echo "The following files have been modified since the most recent git commit:" @echo "" - @git ls-files -m + @git --git-dir=${srcdir}/.git ls-files -m @echo "" @echo "The release will be made from the committed state, but perhaps you meant" @echo "to commit this code first? Please clean this up to make it more clear." |