From 85ae84e89583dfff54905c4632b03bcdc0aa1a79 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 5 Sep 2018 19:11:55 +0000 Subject: 43392: dist: Generate doc/help/* and doc/help.txt in builddir rather than srcdir. Fixes creating tarballs in out-of-tree builds. While here, remove the instruction to build zsh before building a tarball, since that's unneeded. --- ChangeLog | 4 ++++ Doc/Makefile.in | 7 +++---- Etc/creating-a-release.txt | 5 ----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 262a36a63..053eb0013 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-09-06 Daniel Shahaf + * 43392: Doc/Makefile.in, Etc/creating-a-release.txt: dist: + Generate doc/help/* and doc/help.txt in builddir rather than + srcdir. + * 43366: Completion/Zsh/Command/_compdef: Change and add sources for completed completion function names. diff --git a/Doc/Makefile.in b/Doc/Makefile.in index fded2e825..35011091b 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -201,11 +201,10 @@ runhelp: help.txt .PHONY: runhelp help.txt: zshbuiltins.1 - @-rm -f $(sdir)/help.txt $(sdir)/help/* + @-rm -f $@ help/* perl $(sdir_top)/Util/helpfiles \ - $(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \ - || rm -f $(sdir)/help.txt $(sdir)/help/* - touch $(sdir)/$@ + $(sdir)/zshbuiltins.1 help help.txt \ + || rm -f help.txt help/* $(MAN): zmacros.yo zman.yo diff --git a/Etc/creating-a-release.txt b/Etc/creating-a-release.txt index 80b0dd338..bb7272368 100644 --- a/Etc/creating-a-release.txt +++ b/Etc/creating-a-release.txt @@ -35,17 +35,12 @@ To create a zsh release: git checkout zsh-5.5.1-test-1 git diff HEAD # ensure no local mods Util/preconfig && ./configure ... - make make -C Etc make -C Doc everything make tarxz-doc tarxz-src for i in zsh*.tar.?z ; do gpg -ab -- $i ; done # The tarxz-* targets create both *.tar.gz and *.tar.xz. - # - # They must be run in an in-tree build (where the generated 'configure' - # and the generated 'Makefile' are in the same directory), for now, since - # Doc/help/* need to be included in the src tarball. See workers/43373. - [one time step] Add your key to http://zsh.sf.net/Arc/source.html; see README in the 'web' repository for how to do this. Its URL is: -- cgit 1.4.1