diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2007-03-02 23:49:27 -0500 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2007-03-02 23:49:27 -0500 |
| commit | eb8214c9602319d716b8cd39a1c5dd1dd278b96e (patch) | |
| tree | 4e08d7c2ca1922009f7ab5fba42bbae89f065f8f | |
| parent | 8a69a327952173a714dfbe1e8967ebb7bdbbacbd (diff) | |
[ChangeLog.mk] Adapt to latest git-describe output format
| -rw-r--r-- | ChangeLog.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ChangeLog.mk b/ChangeLog.mk index 63c06be6a..99f5ed601 100644 --- a/ChangeLog.mk +++ b/ChangeLog.mk @@ -37,7 +37,7 @@ $(srcdir)/ChangeLog: @if test -d "$(srcdir)/.git"; then \ version=$(CURR_CHANGELOG_VERSION); \ prev=$(PREV_CHANGELOG_VERSION).0; \ - nearest_tag=`git-describe | sed 's/-[^-]*//'`; \ + nearest_tag=`git-describe | sed 's/-.*//'`; \ before=$(srcdir)/ChangeLog.cache-$$prev..$$nearest_tag; \ after=$(srcdir)/ChangeLog.cache-$$nearest_tag..; \ $(MAKE) $(AM_MAKEFLAGS) $$before $$after && \ @@ -73,12 +73,9 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%: ./missing --run git-log --stat "$$spec") > $@.tmp \ && mv -f $@.tmp $@ \ || ($(RM) $@.tmp; \ - echo Failed to generate $@, your $@ may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> $@)); \ + echo Failed to generate $@, your $@ may be outdated >&2); \ else \ - test -f $@ || \ - (echo A git checkout is required to generate $@ >&2 && \ - echo A git checkout is required to generate this file >> $@); \ + echo A git checkout is required to generate $@ >&2; \ fi .PHONY: changelogs ChangeLog $(srcdir)/ChangeLog |