Skip to content

Commit 5ea3f19

Browse files
committed
git.rc: fix PATCHLEVEL detection with rc versions
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 14910ea commit 5ea3f19

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1822,7 +1822,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
18221822
ifeq (,$(findstring .windows.,$(GIT_VERSION)))
18231823
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) -DPATCHLEVEL=0
18241824
else
1825-
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION))))))
1825+
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION)))))))
18261826
endif
18271827

18281828
git.res: git.rc GIT-VERSION-FILE GIT-PREFIX

0 commit comments

Comments
 (0)