summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-12-06 13:45:18 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2016-12-06 13:45:18 +0100
commite82c0641eebd2b542ec5d1aefa9eff3b371128d5 (patch)
tree58abd496ebcbe9e4937fff46384a8fac8ed684c1
parent3311d2a628b98405a1c51fc6bd99d5f28fa13d4e (diff)
downloadrabbitmq-server-git-e82c0641eebd2b542ec5d1aefa9eff3b371128d5.tar.gz
Makefile: PROJECT_VERSION is set in rabbitmq-components.mk
[#130992027]
-rw-r--r--Makefile1
-rw-r--r--rabbitmq-components.mk8
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 430d9657c2..176705010d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
PROJECT = rabbit
PROJECT_DESCRIPTION = RabbitMQ
-PROJECT_VERSION = $(RABBITMQ_VERSION)
PROJECT_MOD = rabbit
PROJECT_REGISTERED = rabbit_amqqueue_sup \
rabbit_direct_client_sup \
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 75cf180b31..81574c5ff5 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -6,8 +6,12 @@ ifeq ($(.DEFAULT_GOAL),)
endif
# PROJECT_VERSION defaults to:
-# 1. the version stored in `git-revisions.txt`, if it exists;
-# 2. a version based on git-describe(1).
+# 1. the version exported by rabbitmq-server-release;
+# 2. the version stored in `git-revisions.txt`, if it exists;
+# 3. a version based on git-describe(1), if it is a Git clone;
+# 4. 0.0.0
+
+PROJECT_VERSION = $(RABBITMQ_VERSION)
ifeq ($(PROJECT_VERSION),)
PROJECT_VERSION := $(shell \