Merge branch 'release'

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 61a9c4c3a7398ada89ff7dc7a78bd0f7af473ae2..0a122ab0e208c29c501bc3aee9c37243e06b13c9 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -10,7 +10,7 @@
 # repository), we let git append identification of the actual commit.
 PACKAGE=notmuch
 
-IS_GIT=$(shell if [ -d ${srcdir}/.git ] ; then echo yes ; else echo no; fi)
+IS_GIT:=$(if $(wildcard ${srcdir}/.git),yes,no)
 
 ifeq ($(IS_GIT),yes)
 DATE:=$(shell git --git-dir=${srcdir}/.git log --date=short -1 --pretty=format:%cd)
@@ -19,9 +19,12 @@ DATE:=$(shell date +%F)
 endif
 
 VERSION:=$(shell cat ${srcdir}/version)
+ELPA_VERSION:=$(subst ~,_,$(VERSION))
 ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),)
 ifeq ($(IS_GIT),yes)
 VERSION:=$(shell git --git-dir=${srcdir}/.git describe --abbrev=7 --match '[0-9.]*'|sed -e s/_/~/ -e s/-/+/ -e s/-/~/)
+# drop the ~g$sha1 part
+ELPA_VERSION:=$(word 1,$(subst ~, ,$(VERSION)))
 # Write the file 'version.stamp' in case its contents differ from $(VERSION)
 FILE_VERSION:=$(shell test -f version.stamp && read vs < version.stamp || vs=; echo $$vs)
 ifneq ($(FILE_VERSION),$(VERSION))
@@ -35,7 +38,7 @@ DEB_TAG=debian/$(UPSTREAM_TAG)-1
 
 RELEASE_HOST=notmuchmail.org
 RELEASE_DIR=/srv/notmuchmail.org/www/releases
-RELEASE_URL=http://notmuchmail.org/releases
+RELEASE_URL=https://notmuchmail.org/releases
 TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz
 DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz
 SHA1_FILE=$(TAR_FILE).sha1
@@ -44,7 +47,8 @@ GPG_FILE=$(SHA1_FILE).asc
 PV_FILE=bindings/python/notmuch/version.py
 
 # Smash together user's values with our extra values
-FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
+STD_CFLAGS := -std=gnu99
+FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(STD_CFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
 FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
 FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
 ifeq ($(LIBDIR_IN_LDCONFIG),0)
@@ -191,7 +195,7 @@ release-message:
        @echo "the Xapian library to provide fast, full-text search with a convenient"
        @echo "search syntax."
        @echo ""
-       @echo "For more about notmuch, see http://notmuchmail.org"
+       @echo "For more about notmuch, see https://notmuchmail.org"
 
 # This is a chain of dependencies rather than a simple list simply to
 # avoid the messages getting interleaved in the case of a parallel
@@ -224,7 +228,7 @@ release-checks:
 .PHONY: verify-newer
 verify-newer:
        @echo -n "Checking that no $(VERSION) release already exists..."
-       @wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
+       @wget -q --no-check-certificate -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \
        case $$? in \
           8) echo "Good." ;; \
           0) echo "Ouch."; \
@@ -271,6 +275,7 @@ dataclean: distclean
 notmuch_client_srcs =          \
        command-line-arguments.c\
        debugger.c              \
+       status.c                \
        gmime-filter-reply.c    \
        hooks.c                 \
        notmuch.c               \