Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

[PATCH] 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.
---
 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:
 



Messages sorted by: Reverse Date, Date, Thread, Author