Windows resource: handle dashes in the Git version gracefully

diff --git a/Makefile b/Makefile
index 7ba8640e18528fe5f20c32839888c95e7ea34ce2..2f7a4f36746ef5b3cad6f7e68b0b8aecf0a91cde 100644 (file)
--- 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