Andrew's git / gitweb.git / diff
?
Windows resource: handle dashes in the Git version gracefully
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Thu, 31 May 2012 17:53:45 +0000 (12:53 -0500)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Tue, 4 Jun 2013 09:11:34 +0000 (10:11 +0100)
Reported by postiffm as issue #14.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Makefile patch | blob | history
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