aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2012-05-31 12:53:45 -0500
committerPat Thoyts <patthoyts@users.sourceforge.net>2013-06-04 10:11:34 +0100
commit2be50eae75ef1d6c83a0546ebe7309f368b5824f (patch)
tree51bd4471778eee42ebba3dd7c52fdd04de1aea69
parentce39c2e04ced177747d02de83f61989dcbcca44e (diff)
downloadgit-2be50eae75ef1d6c83a0546ebe7309f368b5824f.tar.gz
git-2be50eae75ef1d6c83a0546ebe7309f368b5824f.tar.xz
Windows resource: handle dashes in the Git version gracefully
Reported by postiffm as issue #14. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7ba8640e1..2f7a4f367 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