Set the default help format to html for msys builds.

diff --git a/Makefile b/Makefile
index 7ba8640e18528fe5f20c32839888c95e7ea34ce2..a163a75b4e957294ac9f93d3d2a0e37f53ee3b3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1775,9 +1775,9 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
        $(QUIET_GEN)$(cmd_munge_script) && \
        mv $@+ $@
 
-git.res: git.rc
+git.res: git.rc GIT-VERSION-FILE
        $(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