X-Git-Url: https://git.cworth.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.local;h=d8bbf3e17b1f90ab7a54722c0d704307037478ef;hp=10fb99085f54ff9f4f6fef73ae3e41e69dbcf6a4;hb=HEAD;hpb=3eb25c94bd8fe4065d6df6d665ee393cb9a0ad6f

diff --git a/Makefile.local b/Makefile.local
index 10fb9908..7699c208 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,7 +1,7 @@
 # -*- makefile-gmake -*-
 
 .PHONY: all
-all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings
+all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings notmuch-git nmbug
 ifeq ($(MAKECMDGOALS),)
 ifeq ($(shell cat .first-build-message 2>/dev/null),)
 	@NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
@@ -45,6 +45,15 @@ $(SHA256_FILE): $(TAR_FILE)
 $(DETACHED_SIG_FILE): $(TAR_FILE)
 	gpg --armor --detach-sign $^
 
+CLEAN := $(CLEAN) notmuch-git
+notmuch-git: notmuch-git.py
+	cp $< $@
+	chmod ugo+x $@
+
+CLEAN := $(CLEAN) nmbug
+nmbug: notmuch-git
+	ln -s $< $@
+
 .PHONY: dist
 dist: $(TAR_FILE)
 
@@ -73,7 +82,7 @@ release: verify-source-tree-and-version
 	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
 	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
 	mkdir -p releases
-	mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
+	mv $(TAR_FILE) $(DEB_TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
 ifeq ($(REALLY_UPLOAD),yes)
 	git push origin $(VERSION) release pristine-tar
@@ -92,7 +101,11 @@ pre-release:
 	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
 	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
 	mkdir -p releases
-	mv $(TAR_FILE) $(DEB_TAR_FILE) releases
+	mv $(TAR_FILE) $(DEB_TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
+ifeq ($(REALLY_UPLOAD),yes)
+	git push origin $(UPSTREAM_TAG) release pristine-tar
+	cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+endif
 
 .PHONY: debian-snapshot
 debian-snapshot:
@@ -120,8 +133,7 @@ release-message:
 	@echo "Which can be verified with:"
 	@echo ""
 	@echo "  $(RELEASE_URL)/$(SHA256_FILE)"
-	@echo -n "  "
-	@cat releases/$(SHA256_FILE)
+	@sed "s/^/  /" releases/$(SHA256_FILE)
 	@echo ""
 	@echo "  $(RELEASE_URL)/$(DETACHED_SIG_FILE)"
 	@echo "  (signed by `getent passwd "$$USER" | cut -d: -f 5 | cut -d, -f 1`)"
@@ -169,7 +181,7 @@ release-checks:
 
 .PHONY: verify-newer
 verify-newer:
-	@echo -n "Checking that no $(VERSION) release already exists..."
+	@printf %s "Checking that no $(VERSION) release already exists..."
 	@wget -q --no-check-certificate -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
 	case $$? in \
           8) echo "Good." ;; \