From 9f1a6027b44ed6b359ae581e24ddc2daa8e45400 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sun, 19 Apr 2020 06:07:13 +0000 Subject: [PATCH] support compiling outside git checkout When building nmrpflash for Debian, there is no 'git' command available, and there is no '.git' directory either. This makes the build emit warnings from the $(shell) calls in VERSION variable in the Makefile and breaks the '-V' option. The change in this patch accounts for missing 'git' command and resorts to using a STANDALONE_VERSION environment variable which in turn is provided by the package build mechanics. This change has no effect when the git command is available and the '.git' directory is present. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 797aaac..04ad2d5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CC ?= gcc PREFIX ?= /usr/local -VERSION = $(shell git describe --always | tail -c +2) +VERSION := $(shell if [ -d .git ] && which git 2>&1 > /dev/null; then git describe --always | tail -c +2; else echo $$STANDALONE_VERSION; fi) LIBS = -lpcap CFLAGS += -Wall -g -DNMRPFLASH_VERSION=\"$(VERSION)\" LDFLAGS += $(LIBS) -- 2.25.1