Skip to content

Commit 6de20f6

Browse files
dschoGit for Windows Build Agent
authored andcommitted
git.rc: fix PATCHLEVEL detection with rc versions
Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 336b921 commit 6de20f6

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
@@ -1826,7 +1826,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
18261826
ifeq (,$(findstring .windows.,$(GIT_VERSION)))
18271827
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO=, $(wordlist 1,3,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION)))))) -DPATCHLEVEL=0
18281828
else
1829-
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION))))))
1829+
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .rc, ,$(subst .windows., ,$(GIT_VERSION)))))))
18301830
endif
18311831

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

0 commit comments

Comments
 (0)