mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-09 17:16:19 +02:00
Code

31474: create patchlevel.h correctly when using a separate build tree

This commit is contained in:
Barton E. Schaefer 2013-06-13 09:46:43 -07:00
parent 77feb2c1c4
commit e36e7d9ade
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-06-13 Barton E. Schaefer <schaefer@zsh.org>
* 31474: Makefile.in, Src/zsh.mdd: create patchlevel.h correctly
when running make in a separate build tree
2013-06-09 Barton E. Schaefer <schaefer@zsh.org>
* 31466: .cvsignore, .gitignore: Cause git and cvs to ignore

2
Makefile.in
View File

@ -160,7 +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
echo '#define ZSH_PATCHLEVEL "'`cd $(sdir_top) && git describe --tags --long`'"' >$(DISTNAME)/Src/patchlevel.h.release
tar cf - $(DISTNAME) | gzip -9 > $@
rm -rf $(DISTNAME)

2
Src/zsh.mdd
View File

@ -43,7 +43,7 @@ patchlevel.h: FORCE
@if [ -f $(sdir)/$@.release ]; then \
cp -f $(sdir)/$@.release $@; \
else \
echo '#define ZSH_PATCHLEVEL "'`git describe --tags --long`'"' > $@.tmp; \
echo '#define ZSH_PATCHLEVEL "'`cd $(sdir) && git describe --tags --long`'"' > $@.tmp; \
cmp $@ $@.tmp && rm -f $@.tmp || mv $@.tmp $@; \
fi
FORCE: