From 21117a2cb12ff470a27d198ac3ba08fcc739e3d2 Mon Sep 17 00:00:00 2001 From: Anders Date: Sat, 2 Jan 2021 22:55:53 -0800 Subject: [PATCH] makefile: allow .git to be a file or directory to handle submodules Change test for -e (exists) instead of -d (directory) so that the .git entry is detected correctly and git version stamp logic runs as in any other git repo. The .git entry is a file when the repo is a submodules and possibly other obscure cases like multiple worktrees. fixes #988 --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index e590eb02..0d539848 100644 --- a/makefile +++ b/makefile @@ -273,7 +273,7 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin) OS_CCDEFS += -Wno-deprecated endif endif - ifeq (git-repo,$(shell if ${TEST} -d ./.git; then echo git-repo; fi)) + ifeq (git-repo,$(shell if ${TEST} -e ./.git; then echo git-repo; fi)) GIT_PATH=$(strip $(shell which git)) ifeq (,$(GIT_PATH)) $(error building using a git repository, but git is not available)