Mercurial > vim
changeset 32309:d245cd5b3bd7 v9.0.1486
patch 9.0.1486: parallel make might not work
Commit: https://github.com/vim/vim/commit/cfc788c38848adcd54e4130f16f2813cd1e215dd
Author: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon Apr 24 22:41:53 2023 +0100
patch 9.0.1486: parallel make might not work
Problem: Parallel make might not work.
Solution: Add missing dependencies. (Samuel Dionne-Riel, closes https://github.com/vim/vim/issues/12288)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 24 Apr 2023 23:45:02 +0200 |
| parents | 78e122c7239f |
| children | c6eab83d1ba9 |
| files | src/Makefile src/version.c |
| diffstat | 2 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -455,6 +455,7 @@ CClink = $(CC) # Uncomment this when you want to include the Tcl interface. # First one is for static linking, second one for dynamic loading. # Debian package is "tcl-dev". +# This requires at least "normal" features, "tiny" doesn't work. #CONF_OPT_TCL = --enable-tclinterp #CONF_OPT_TCL = --enable-tclinterp=dynamic #CONF_OPT_TCL = --enable-tclinterp --with-tclsh=tclsh8.4 @@ -585,7 +586,7 @@ CClink = $(CC) # configure or afterwards. For examples see below. # When using -g with some older versions of Linux you might get a # statically linked executable. -# When not defined, configure will try to use -O2 -g for gcc and -O for cc. +# When not defined, configure will try to use -O2 for gcc and -O for others. #CFLAGS = -g #CFLAGS = -O @@ -2329,7 +2330,7 @@ installruntime: installrtbase installmac # Install the help files; first adjust the contents for the final location. # Also install most of the other runtime files. -installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \ +installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \ $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \ $(DEST_SYN) $(DEST_SYN)/shared $(DEST_IND) \ $(DEST_FTP) $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \ @@ -2342,8 +2343,10 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DES cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)" -a -f tags; then \ mv -f tags tags.dist; fi @echo generating help tags - -@cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ - $(MAKE) VIMEXE=$(DEST_BIN)/$(VIMTARGET) vimtags; fi + # We can assume Vim was build, but it may not have been installed, + # thus use the executable in the current directory. + -@BUILD_DIR="`pwd`"; cd $(HELPSOURCE); if test -z "$(CROSS_COMPILING)"; then \ + $(MAKE) VIMEXE="$$BUILD_DIR/$(VIMTARGET)" vimtags; fi cd $(HELPSOURCE); \ files=`ls *.txt tags`; \ files="$$files `ls *.??x tags-?? 2>/dev/null || true`"; \ @@ -2658,7 +2661,7 @@ install-icons: $(MKDIR_P) $@ -chmod $(DIRMOD) $@ -# create links from various names to vim. This is only done when the links +# Create links from various names to vim. This is only done when the links # (or executables with the same name) don't exist yet. installlinks: $(GUI_TARGETS) \ $(DEST_BIN)/$(EXTARGET) \ @@ -2678,40 +2681,40 @@ installglinks: $(DEST_BIN)/$(GVIMTARGET) installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET) installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET) -$(DEST_BIN)/$(EXTARGET): +$(DEST_BIN)/$(EXTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET) -$(DEST_BIN)/$(VIEWTARGET): +$(DEST_BIN)/$(VIEWTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIEWTARGET) -$(DEST_BIN)/$(GVIMTARGET): +$(DEST_BIN)/$(GVIMTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMTARGET) -$(DEST_BIN)/$(GVIEWTARGET): +$(DEST_BIN)/$(GVIEWTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET) -$(DEST_BIN)/$(RVIMTARGET): +$(DEST_BIN)/$(RVIMTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET) -$(DEST_BIN)/$(RVIEWTARGET): +$(DEST_BIN)/$(RVIEWTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIEWTARGET) -$(DEST_BIN)/$(RGVIMTARGET): +$(DEST_BIN)/$(RGVIMTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIMTARGET) -$(DEST_BIN)/$(RGVIEWTARGET): +$(DEST_BIN)/$(RGVIEWTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET) -$(DEST_BIN)/$(VIMDIFFTARGET): +$(DEST_BIN)/$(VIMDIFFTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET) -$(DEST_BIN)/$(GVIMDIFFTARGET): +$(DEST_BIN)/$(GVIMDIFFTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET) -$(DEST_BIN)/$(EVIMTARGET): +$(DEST_BIN)/$(EVIMTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET) -$(DEST_BIN)/$(EVIEWTARGET): +$(DEST_BIN)/$(EVIEWTARGET): $(DEST_BIN) cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIEWTARGET) # Create links for the manual pages with various names to vim. This is only