X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.global;fp=Makefile.global;h=d8f335af6c15b96f14853c55583b957320bba7cb;hp=444e6bb42f624ac000c348ab41473aa0f677d17b;hb=10f8c5d205d5398bb86809bf8e7958038ba3b6fe;hpb=46a47f06a628c7025246da040fa9ab6301c49313 diff --git a/Makefile.global b/Makefile.global index 444e6bb4..d8f335af 100644 --- a/Makefile.global +++ b/Makefile.global @@ -23,6 +23,8 @@ 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))) +# convert git version to package.el friendly form +ELPA_VERSION:=$(subst +,snapshot,$(ELPA_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)