emacs: don't fset keymaps

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 39f36d5019f5c6d31ee29a67a6206032495febfc..fb12629420224d41ea981bbecd1007616f28727c 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -1,4 +1,4 @@
-# -*- makefile -*-
+# -*- makefile-gmake -*-
 
 .PHONY: all
 all: notmuch notmuch-shared build-man build-info ruby-bindings python-cffi-bindings
@@ -19,7 +19,7 @@ endif
 
 # Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes)
 # this file may already have been updated.
-version.stamp: $(srcdir)/version
+version.stamp: $(srcdir)/version.txt
        echo $(VERSION) > $@
 
 $(TAR_FILE):
@@ -30,12 +30,12 @@ $(TAR_FILE):
           echo "Warning: No signed tag for $(VERSION)"; \
        fi ; \
        git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
-       echo $(VERSION) > version.tmp
+       echo $(VERSION) > version.txt.tmp
        ct=`git --no-pager log -1 --pretty=format:%ct $$ref` ; \
        tar --owner root --group root --append -f $(TAR_FILE).tmp \
                --transform s_^_$(PACKAGE)-$(VERSION)/_  \
-               --transform 's_.tmp$$__' --mtime=@$$ct version.tmp
-       rm version.tmp
+               --transform 's_.tmp$$__' --mtime=@$$ct version.txt.tmp
+       rm version.txt.tmp
        xz -C sha256 -9 < $(TAR_FILE).tmp > $(TAR_FILE)
        @echo "Source is ready for release in $(TAR_FILE)"
 
@@ -54,7 +54,7 @@ update-versions:
        sed -i -e "s/^__VERSION__[[:blank:]]*=.*$$/__VERSION__ = \'${VERSION}\'/" \
            -e "s/^SOVERSION[[:blank:]]*=.*$$/SOVERSION = \'${LIBNOTMUCH_VERSION_MAJOR}\'/" \
            ${PV_FILE}
-       cp version bindings/python-cffi
+       cp version.txt bindings/python-cffi
 
 # We invoke make recursively only to force ordering of our phony
 # targets in the case of parallel invocation of make (-j).
@@ -64,9 +64,10 @@ update-versions:
 # are part of the release and need to take the version from the
 # version file).
 .PHONY: release
-release: verify-source-tree-and-version sphinx-html
+release: verify-source-tree-and-version
        $(MAKE) VERSION=$(VERSION) verify-newer
        $(MAKE) VERSION=$(VERSION) clean
+       $(MAKE) VERSION=$(VERSION) sphinx-html
        $(MAKE) VERSION=$(VERSION) test
        git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
        $(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
@@ -294,7 +295,7 @@ CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
 CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
 CLEAN := $(CLEAN) .deps
 
-DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config
+DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config sh.config sphinx.config
 
 CPPCHECK_STAMPS := $(SRCS:%=.stamps/cppcheck/%)
 .PHONY: cppcheck