Merge branch 'js/mingw-res-rebuild'

gitster · gitster · commit 39847644adb3 · 2018-11-18T18:23:53.000+09:00
Windows build update.

* js/mingw-res-rebuild:
  Windows: force-recompile git.res for differing architectures
diff --git a/Makefile b/Makefile
@@ -2111,7 +2111,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
 	$(QUIET_GEN)$(cmd_munge_script) && \
 	mv $@+ $@
 
-git.res: git.rc GIT-VERSION-FILE
+git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
 	$(QUIET_RC)$(RC) \
 	  $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
 	    $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \
