From 9b0dfd11c5d4af6dc4cd2b79f33e0d6c460d414e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Jul 2011 17:28:47 -0300 Subject: [PATCH] build-system: use signed tag to make tar file, if available. This as the advantage that "make VERSION=n.m dist" will work correctly even if the wrong branch happens to be checked out. --- Makefile.local | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.local b/Makefile.local index 990f8204..7fc68163 100644 --- a/Makefile.local +++ b/Makefile.local @@ -61,7 +61,13 @@ endif endif $(TAR_FILE): - git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp + if git tag -v $(VERSION) >/dev/null 2>&1; then \ + ref=$(VERSION); \ + else \ + ref="HEAD" ; \ + echo "Warning: No signed tag for $(VERSION)"; \ + fi ; \ + git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp echo $(VERSION) > version.tmp tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ --transform 's_.tmp$$__' version.tmp rm version.tmp -- 2.26.2