From 2c173017522091b2f689107a3aa5b0129a3dcbd9 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Sat, 20 May 2017 06:03:35 +0000 Subject: [PATCH] pass the top-level version to packaging targets Signed-off-by: Andrew Hsu --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 257af72e8d..ba7b1ed3c3 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ CLI_DIR:=$(CURDIR)/components/cli ENGINE_DIR:=$(CURDIR)/components/engine PACKAGING_DIR:=$(CURDIR)/components/packaging +VERSION=$(shell cat VERSION) help: ## show make targets @awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf " \033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) @@ -12,10 +13,10 @@ $(CLI_DIR)/build/docker: $(MAKE) -C $(CLI_DIR) -f docker.Makefile build deb: ## build deb packages - $(MAKE) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) deb + $(MAKE) VERSION=$(VERSION) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) deb rpm: ## build rpm packages - $(MAKE) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) rpm + $(MAKE) VERSION=$(VERSION) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) rpm static: ## build static packages - $(MAKE) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) static + $(MAKE) VERSION=$(VERSION) CLI_DIR=$(CLI_DIR) ENGINE_DIR=$(ENGINE_DIR) -C $(PACKAGING_DIR) static