diff options
author | Jim Meyering <meyering@redhat.com> | 2007-11-11 20:05:08 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2007-11-13 00:10:48 +0100 |
commit | 3b793a96bb043a9ed2e7eea4544cfffcaac7aa3b (patch) | |
tree | 8d53deabfa720b1fd8152910569f62dc97207adf /GNUmakefile | |
parent | 703fbf369a521caa492df0ce38db36691ba358b8 (diff) | |
download | autoconf-3b793a96bb043a9ed2e7eea4544cfffcaac7aa3b.tar.gz |
Accommodate non-srcdir build-from-checkout.
* build-aux/git-version-gen: Require an additional parameter: $srcdir.
Use git's --git-dir=$srcdir/.git option.
Add quotes, in case tarball_version_file contains shell meta-characters.
* GNUmakefile (_curr-ver): Pass $(srcdir) to git-version-gen.
* configure.ac: Pass "." to git-version-gen.
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index cace1601..cec6444a 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -50,7 +50,7 @@ include Makefile ifeq (0,$(MAKELEVEL)) _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS)) ifneq (,$(_is-dist-target)) - _curr-ver := $(shell build-aux/git-version-gen .version) + _curr-ver := $(shell build-aux/git-version-gen $(srcdir) .version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) dummy := $(shell rm -rf autom4te.cache; autoreconf -i && $(MAKE) clean) |