From 0507aa15fcd5431dfb2187e4229f22f04d1d0c7c Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Wed, 20 Jan 2021 09:14:21 -0800 Subject: [PATCH] makefile: precisely determine submodule name to avoid similar name matches As discussed in #1000 --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 1d2c7a08..93f21eb0 100644 --- a/makefile +++ b/makefile @@ -951,7 +951,7 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin) GIT_COMMIT_TIME=$(shell grep 'define SIM_GIT_COMMIT_TIME' sim_rev.h | awk '{ print $$3 }') else ifeq (git-submodule,$(if $(shell cd .. ; git rev-parse --git-dir 2>/dev/null),git-submodule)) - GIT_COMMIT_ID=$(shell cd .. ; git submodule status | grep "$(notdir $(realpath .))" | awk '{ print $$1 }') + GIT_COMMIT_ID=$(shell cd .. ; git submodule status | grep " $(notdir $(realpath .)) " | awk '{ print $$1 }') GIT_COMMIT_TIME=$(shell git --git-dir=$(realpath .)/.git log $(GIT_COMMIT_ID) -1 --pretty="%aI") else $(info *** Error ***)