[PATCH] Generate tar.xz artifacts only.

[PATCH] Generate tar.xz artifacts only.

[Daniel Shahaf]

---
Does anyone wish tar.gz artifacts to continue to be produced?

No one complained when 5.6.1 was released without tar.gz artifacts, so let's
take this opportunity to simplify the workflow.

Cheers,

Daniel

 Etc/creating-a-release.txt |  2 --
 Makefile.in                | 21 ++++++---------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Etc/creating-a-release.txt b/Etc/creating-a-release.txt
index bb5502e35..2445151f5 100644
--- a/Etc/creating-a-release.txt
+++ b/Etc/creating-a-release.txt
@@ -40,8 +40,6 @@ To create a zsh release:
 	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.
-
 - [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:
 
 	git clone git://git.code.sf.net/p/zsh/web
diff --git a/Makefile.in b/Makefile.in
index 00d74b7f2..d8568294b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -159,28 +159,19 @@ $(sdir)/stamp-h.in: $(sdir)/configure
 
 DISTNAME = zsh-$(VERSION)
 
-targz-src: $(DISTNAME).tar.gz
-$(DISTNAME).tar.gz: FORCE
+tarxz-src: $(DISTNAME).tar.xz
+$(DISTNAME).tar.xz: FORCE
 	@$(sdir_top)/Util/mkdisttree.sh $(DISTNAME) $(sdir_top) $(dir_top) SRC \
 	    $(MAKE) $(MAKEDEFS)
 	echo '#define ZSH_PATCHLEVEL "'`cd $(sdir_top) && git describe --tags --long --abbrev=7`'"' >$(DISTNAME)/Src/patchlevel.h.release
-	tar cf - $(DISTNAME) | gzip -9 > $@
+	tar cf - $(DISTNAME) | xz -9 > $@
 	rm -rf $(DISTNAME)
 
-targz-doc: $(DISTNAME)-doc.tar.gz
-$(DISTNAME)-doc.tar.gz: FORCE
+tarxz-doc: $(DISTNAME)-doc.tar.xz
+$(DISTNAME)-doc.tar.xz: FORCE
 	@$(sdir_top)/Util/mkdisttree.sh $(DISTNAME) $(sdir_top) $(dir_top) DOC \
 	    $(MAKE) $(MAKEDEFS)
-	tar cf - $(DISTNAME) | gzip -9 > $@
+	tar cf - $(DISTNAME) | xz -9 > $@
 	rm -rf $(DISTNAME)
 
 FORCE:
-
-tarxz-src: $(DISTNAME).tar.xz
-$(DISTNAME).tar.xz: $(DISTNAME).tar.gz
-	< $< zcat | xz -9 > $@
-
-tarxz-doc: $(DISTNAME)-doc.tar.xz
-$(DISTNAME)-doc.tar.xz: $(DISTNAME)-doc.tar.gz
-	< $< zcat | xz -9 > $@
-