diff options
| -rw-r--r-- | src/Makefile | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/Makefile b/src/Makefile index a84efd6d6..c0bc45fa6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -207,27 +207,14 @@ install : # # Version number calculations # -ifneq ($(wildcard ../.git),) -VERSIONS := $(shell git describe --tags --always --long --abbrev=1 --match "v*") -VERSION_TUPLE := $(subst ., ,$(subst -, ,$(patsubst v%,%,$(VERSIONS)))) -VERSION_MAJOR := $(word 1,$(VERSION_TUPLE)) -VERSION_MINOR := $(word 2,$(VERSION_TUPLE)) -VERSION_PATCH := $(word 3,$(VERSION_TUPLE)) -ifeq ($(word 4,$(VERSION_TUPLE)),0) -EXTRAVERSION := -else -EXTRAVERSION := + -endif -GITVERSION = $(word 5,$(VERSION_TUPLE)) -else VERSION_MAJOR = 1 VERSION_MINOR = 0 VERSION_PATCH = 0 EXTRAVERSION = + -endif MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION) -ifneq ($(GITVERSION),) +ifneq ($(wildcard ../.git),) +GITVERSION := $(shell git describe --always --abbrev=1 --match "" 2>/dev/null) VERSION += ($(GITVERSION)) endif version : |