lib: support user prefix names in term generation

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 82145e1b4e8e83122f44bb3313fbe457e261bfe9..3c6dacbccc4b3af1e43d89fcf8e69dd23997aed0 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -36,14 +36,14 @@ $(TAR_FILE):
                --transform s_^_$(PACKAGE)-$(VERSION)/_  \
                --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
        rm version.tmp
-       gzip -n < $(TAR_FILE).tmp > $(TAR_FILE)
+       xz -C sha256 -9 < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
 $(SHA256_FILE): $(TAR_FILE)
-       sha256sum $^ > $@
+       sha256sum $^ | gpg --clear-sign --output $@ -
 
-$(GPG_FILE): $(SHA256_FILE)
-       gpg --armor --sign $^
+$(DETACHED_SIG_FILE): $(TAR_FILE)
+       gpg --armor --detach-sign $^
 
 .PHONY: dist
 dist: $(TAR_FILE)
@@ -68,16 +68,16 @@ release: verify-source-tree-and-version
        $(MAKE) VERSION=$(VERSION) clean
        $(MAKE) VERSION=$(VERSION) test
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
-       $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
+       $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
        ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
        pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
        git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
        mkdir -p releases
-       mv $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) releases
+       mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
        $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
        git push origin $(VERSION) $(DEB_TAG) release pristine-tar
-       cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+       cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
        ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
 endif
        @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template."
@@ -121,7 +121,7 @@ release-message:
        @echo -n "  "
        @cat releases/$(SHA256_FILE)
        @echo ""
-       @echo "  $(RELEASE_URL)/$(GPG_FILE)"
+       @echo "  $(RELEASE_URL)/$(DETACHED_SIG_FILE)"
        @echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
        @echo ""
        @echo "What's new in notmuch $(VERSION)"