From 5ea3f1965e445a260328f62b336bce2f787a3742 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 4 Nov 2016 18:06:01 +0100 Subject: [PATCH] git.rc: fix PATCHLEVEL detection with rc versions Signed-off-by: Johannes Schindelin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e53d7a4036..3e06ea1c61 100644 --- a/Makefile +++ b/Makefile @@ -1822,7 +1822,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES ifeq (,$(findstring .windows.,$(GIT_VERSION))) RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) -DPATCHLEVEL=0 else -RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) +RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION))))))) endif git.res: git.rc GIT-VERSION-FILE GIT-PREFIX