diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:31 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-09 14:31:31 +0900 |
| commit | d3e32dc90c800ef35a7e5f52906a0bedae2ae008 (patch) | |
| tree | 1d3ad69773338afd4f8f09f1a6b0d06488374b05 /Makefile | |
| parent | 906329f369e0899d619f53071f7364270f887947 (diff) | |
| parent | 39bb86b4e51a209e2bca765eab50eaffae56e527 (diff) | |
| download | git-d3e32dc90c800ef35a7e5f52906a0bedae2ae008.tar.gz git-d3e32dc90c800ef35a7e5f52906a0bedae2ae008.tar.xz | |
Merge branch 'js/mingw-full-version-in-resources'
MinGW updates.
* js/mingw-full-version-in-resources:
mingw: include the full version information in the resources
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1940,7 +1940,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES git.res: git.rc GIT-VERSION-FILE $(QUIET_RC)$(RC) \ - $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \ + $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \ + $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \ -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@ # This makes sure we depend on the NO_PERL setting itself. |