From 957702af94af22e10377493608befd9750815b5d Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 14 May 2020 11:35:20 +0200 Subject: [PATCH] Makefile: fix version indicator If we execute `wg --version` we get a different version string that does not match with the version string in the openwrt makefile. Current version string: `wireguard-tools vreboot-13159-gac5caa2718 -https://git.zx2c4.com/wireguard-tools/` Corrected versions string: `wireguard-tools v1.0.20200319 -https://git.zx2c4.com/wireguard-tools/` Signed-off-by: Florian Eckert Signed-off-by: Jason A. Donenfeld --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index 037d2dd..fc5e0c6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -48,7 +48,7 @@ CFLAGS += -DRUNSTATEDIR="\"$(RUNSTATEDIR)\"" ifeq ($(DEBUG),yes) CFLAGS += -g endif -WIREGUARD_TOOLS_VERSION = $(patsubst v%,%,$(shell GIT_CEILING_DIRECTORIES="$(PWD)/../.." git describe --dirty 2>/dev/null)) +WIREGUARD_TOOLS_VERSION = $(patsubst v%,%,$(shell GIT_DIR="$(PWD)/../.git" git describe --dirty 2>/dev/null)) ifneq ($(WIREGUARD_TOOLS_VERSION),) CFLAGS += -D'WIREGUARD_TOOLS_VERSION="$(WIREGUARD_TOOLS_VERSION)"' endif