From 1d369a3c18292ee9a5bed543c5406772d09a2133 Mon Sep 17 00:00:00 2001 From: Kai Krakow Date: Sun, 18 Nov 2018 16:10:32 +0100 Subject: [PATCH] Makefile: Fix git usage for non-git source archive We didn't take enough care to fix all invocations of git in this scenario. Fixes: 32d2739 ("Makefile: Specify version when building from tarball") Signed-off-by: Kai Krakow --- Makefile | 2 +- lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a065a97..420b760 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ clean: ## Cleanup .PHONY: lib src test lib: ## Build libs - $(MAKE) -C lib + $(MAKE) TAG="$(BEES_VERSION)" -C lib src: ## Build bins src: lib diff --git a/lib/Makefile b/lib/Makefile index c0881a1..df4ff38 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -TAG := $(shell git describe --always --dirty || echo UNKNOWN) +TAG ?= $(shell git describe --always --dirty || echo UNKNOWN) default: libcrucible.so %.so: Makefile