From 6cd459ceeaa024639e4f905b871971c9c0794326 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 1 Jan 2020 09:57:51 +0000 Subject: build: remove NEWS from dist-git target mknews doesn't require any optional dependencies a user wouldn't normally have. We can save storage and bandwidth costs by letting cgit serve the exact tar.gz which "git archive | gzip -n" generates. --- Documentation/include.mk | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Documentation/include.mk b/Documentation/include.mk index f2605346..0229bf40 100644 --- a/Documentation/include.mk +++ b/Documentation/include.mk @@ -109,15 +109,14 @@ clean-doc: clean :: clean-doc # No camel-cased tarballs or pathnames which MakeMaker creates, -# this may not always be a Perl project. -git-dist :: ver = $(shell git describe |sed -ne 's/v//p') -git-dist :: pkgpfx := public-inbox-$(ver) -git-dist :: NEWS - git archive --prefix=$(pkgpfx)/ --format=tar HEAD^{tree} >$(pkgpfx).tar - mkdir -p $(pkgpfx) - cp NEWS $(pkgpfx)/NEWS - $(TAR) rf $(pkgpfx).tar $(pkgpfx)/NEWS - $(RM) $(pkgpfx)/NEWS - rmdir $(pkgpfx) - gzip -9 $(pkgpfx).tar - @echo $(pkgpfx).tar.gz created +# this may not always be a Perl project. This should match what +# cgit generate, since git maintainers ensure git-archive has +# stable tar output +DIST_TREE = HEAD^{tree} +DIST_VER = +git-dist : + ver=$$(git describe $(DIST_VER) | sed -ne s/v//p); \ + pkgpfx=public-inbox-$$ver; \ + git archive --prefix=$$pkgpfx/ --format=tar $(DIST_TREE) \ + | gzip -n >$$pkgpfx.tar.gz; \ + echo $$pkgpfx.tar.gz created -- cgit v1.2.3-24-ge0c7