diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | Src/zsh.mdd | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 0651cd6f6..28b5174c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-04-09 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 31246: Makefile.in, Src/zsh.mdd: make a separate patch level + header for releases. + 2013-04-08 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Completion/Unix/Command/.distfiles, diff --git a/Makefile.in b/Makefile.in index 5fb736f2c..a29ab7885 100644 --- a/Makefile.in +++ b/Makefile.in @@ -160,6 +160,7 @@ targz-src: $(DISTNAME).tar.gz $(DISTNAME).tar.gz: FORCE @$(sdir_top)/Util/mkdisttree.sh $(DISTNAME) $(sdir_top) $(dir_top) SRC \ $(MAKE) $(MAKEDEFS) + echo '#define ZSH_PATCHLEVEL "'`git describe --tags --long`'"' >$(DISTNAME)/Src/patchlevel.h.release tar cf - $(DISTNAME) | gzip -9 > $@ rm -rf $(DISTNAME) diff --git a/Src/zsh.mdd b/Src/zsh.mdd index 420e8fc1d..0fec5c363 100644 --- a/Src/zsh.mdd +++ b/Src/zsh.mdd @@ -40,8 +40,12 @@ version.h: $(sdir_top)/Config/version.mk zshcurses.h zshterm.h echo '#define ZSH_VERSION "'$(VERSION)'"' > $@ patchlevel.h: FORCE - echo '#define ZSH_PATCHLEVEL "'`git describe --tags --long`'"' > $@.tmp - cmp $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@ + @if [ -f $(sdir)/$@.release ]; then \ + cp -f $(sdir)/$@.release $@; \ + else \ + echo '#define ZSH_PATCHLEVEL "'`git describe --tags --long`'"' > $@.tmp; \ + cmp $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@; \ + fi FORCE: zshcurses.h: ../config.h |