From 014eaf7e810dda8be5eaf97c37c9f86e6e839022 Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Fri, 31 Aug 2018 23:34:11 +0200 Subject: 43358: enforce consistent patchlevel form --- ChangeLog | 2 ++ Src/zsh.mdd | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2af46224..495399462 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2018-08-31 Oliver Kiddle + * 43358: Src/zsh.mdd: enforce consistent patchlevel form + * 43357: configure.ac: isinf/isnan can be macros rather than functions so need a custom configure test diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 324435d62..3e5788af5 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -53,8 +53,8 @@ patchlevel.h: FORCE @if [ -f $(sdir)/$@.release ]; then \ cp -f $(sdir)/$@.release $@; \ else \ - echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long`'"' > $@.tmp; \ - cmp $@ $@.tmp >/dev/null 2>&1 && rm -f $@.tmp || mv $@.tmp $@; \ + echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long --abbrev=7`'"' > $@.tmp; \ + cmp $@ $@.tmp >/dev/null 2>&1 && rm -f $@.tmp || mv -f $@.tmp $@; \ fi FORCE: -- cgit 1.4.1