From 2be50eae75ef1d6c83a0546ebe7309f368b5824f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 31 May 2012 12:53:45 -0500 Subject: [PATCH] Windows resource: handle dashes in the Git version gracefully Reported by postiffm as issue #14. Signed-off-by: Johannes Schindelin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7ba8640e18..2f7a4f3674 100644 --- a/Makefile +++ b/Makefile @@ -1777,7 +1777,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc $(QUIET_RC)$(RC) \ - $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst ., ,$(GIT_VERSION)))) \ + $(join -DMAJOR= -DMINOR= -DPATCH=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@ ifndef NO_PERL -- 2.11.4.GIT