makefile: precisely determine submodule name to avoid similar name matches

As discussed in #1000
This commit is contained in:
Mark Pizzolato 2021-01-20 09:14:21 -08:00
parent 9f064db561
commit 0507aa15fc

View file

@ -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 ***)