From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: [PATCH] dist: Generate doc/help/* and doc/help.txt in builddir rather than srcdir.
Date: Wed, 5 Sep 2018 19:11:55 +0000 [thread overview]
Message-ID: <20180905191155.13819-1-danielsh@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <20180905101445.47xb2barz2shlvno@tarpaulin.shahaf.local2>
Fixes creating tarballs in out-of-tree builds.
While here, remove the instruction to build zsh before building
a tarball, since that's unneeded.
---
Doc/Makefile.in | 7 +++----
Etc/creating-a-release.txt | 5 -----
2 files changed, 3 insertions(+), 9 deletions(-)
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:
prev parent reply other threads:[~2018-09-05 19:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1536069840.16910.ezmlm@zsh.org>
2018-09-04 14:44 ` Fwd: MODERATE for zsh-announce@zsh.org Bart Schaefer
2018-09-05 7:54 ` Baptiste Daroussin
2018-09-05 8:07 ` Peter Stephenson
2018-09-05 10:14 ` Daniel Shahaf
2018-09-05 19:11 ` Daniel Shahaf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180905191155.13819-1-danielsh@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).