diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2010-05-28 12:15:23 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-05-28 17:22:17 +0200 |
| commit | 8ab5996c4a14364411442d93babb343cc2ce0d89 (patch) | |
| tree | c9e3f7a5e57bbe7b937a9f26e8e33b86aa4a2e81 /top/GNUmakefile | |
| parent | 8b4add2c64d10b260c21352768e22d41dc9d2ff7 (diff) | |
| download | gnulib-8ab5996c4a14364411442d93babb343cc2ce0d89.tar.gz | |
git-version-gen: take a sed script to transform the git tag
* build-aux/git-version-gen (tag_sed_script): New variable. Use it to
transform the output of "git describe" to the canonical form.
* top/GNUmakefile (_curr-ver): Pass $(git-version-gen-tag-sed-script) as
a second argument to `git-version-gen'.
Diffstat (limited to 'top/GNUmakefile')
| -rw-r--r-- | top/GNUmakefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/top/GNUmakefile b/top/GNUmakefile index daba47ae2d..97fea36538 100644 --- a/top/GNUmakefile +++ b/top/GNUmakefile @@ -60,8 +60,10 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS))) _is-install-target ?= $(filter-out %check, $(filter install%,$(MAKECMDGOALS))) ifneq (,$(_is-dist-target)$(_is-install-target)) - _curr-ver := $(shell cd $(srcdir) \ - && $(_build-aux)/git-version-gen .tarball-version) + _curr-ver := $(shell cd $(srcdir) \ + && $(_build-aux)/git-version-gen \ + .tarball-version \ + $(git-version-gen-tag-sed-script)) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) $(info WARNING: unable to verify if $(VERSION) is the correct version) |