From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 31 May 2012 17:53:45 +0000 (-0500)
Subject: Windows resource: handle dashes in the Git version gracefully
X-Git-Tag: v1.8.4-rc0~198^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2be50eae75ef1d6c83a0546ebe7309f368b5824f;p=thirdparty%2Fgit.git

Windows resource: handle dashes in the Git version gracefully

Reported by postiffm as issue #14.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---

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