root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Makefile: Use a recursively expanded var for `RABBITMQ_VERSION` 

This fixes proper propagation of `RABBITMQ_VERSION`.

[#130992027]
This commit is contained in:
Jean-Sébastien Pédron 2016-12-08 19:02:49 +01:00
parent 2c83f8915d
commit ba5bc15ac4
No known key found for this signature in database
GPG Key ID: 39E99761A5FD94CC
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -5,7 +5,7 @@ PROJECT_DESCRIPTION = RabbitMQ Server
# other components. If PROJECT_VERSION is unset, then an empty variable
# is propagated and the default version will fallback to the default
# value from rabbitmq-components.mk.
export RABBITMQ_VERSION := $(PROJECT_VERSION)
export RABBITMQ_VERSION = $(PROJECT_VERSION)
# Release artifacts are put in $(PACKAGES_DIR).
PACKAGES_DIR ?= $(abspath PACKAGES)

2
rabbitmq-components.mk
View File

@ -11,7 +11,7 @@ endif
# 3. a version based on git-describe(1), if it is a Git clone;
# 4. 0.0.0
PROJECT_VERSION = $(RABBITMQ_VERSION)
PROJECT_VERSION := $(RABBITMQ_VERSION)
ifeq ($(PROJECT_VERSION),)
PROJECT_VERSION := $(shell \