From 29958745c8f58cffd24e1793702524ce84545e5a Mon Sep 17 00:00:00 2001 From: Jan Maria Matejka Date: Thu, 3 May 2018 11:14:49 +0200 Subject: Makefile: Only set git version if BIRD is build from its repository. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Toke Høiland-Jørgensen for reporting this bug. --- Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8168bbe..eb6cc5c9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,11 +21,6 @@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ INSTALL_DATA=@INSTALL_DATA@ -git-label:=$(strip $(shell git describe --always --dirty=-x 2>/dev/null)) -ifneq ($(git-label),) - CFLAGS += -DGIT_LABEL="$(git-label)" -endif - client=$(addprefix $(exedir)/,@CLIENT@) daemon=$(exedir)/bird protocols=@protocols@ @@ -42,6 +37,11 @@ srcdir := @srcdir@ objdir := @objdir@ exedir := @exedir@ +git-label:=$(strip $(shell cd $(srcdir) && [ "$$(git rev-parse --show-toplevel)" = "$$(readlink -f .)" ] && git describe --always --dirty=-x 2>/dev/null)) +ifneq ($(git-label),) + CFLAGS += -DGIT_LABEL="$(git-label)" +endif + ifeq ($(objdir),.) objdir := $(realpath .) endif -- cgit v1.2.3