From 6c68e81da799b1be3636db0e76f29d5a33e69613 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 3ac472f..37412c3 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ clean: ## Cleanup .PHONY: lib src test doc 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 f876fc2..3c3ccea 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