Mercurial > vim
comparison src/Makefile @ 34949:b3288dc18627 v9.1.0331
patch 9.1.0331: make install does not install all files
Commit: https://github.com/vim/vim/commit/fc1dabd77baa86bcbf312cb86b3fd37e478994b1
Author: Matt Hammerly <hammerly.matt@gmail.com>
Date: Mon Apr 15 18:54:38 2024 +0200
patch 9.1.0331: make install does not install all files
Problem: make install does not install all files (Nick Jensen)
Solution: Adjust the Makefile rule to install and uninstall cargo and
rust directories (Matt Hammerly)
fixes: #14551
closes: #14552
closes: #14557
Signed-off-by: Matt Hammerly <hammerly.matt@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Mon, 15 Apr 2024 19:00:06 +0200 |
parents | c5a10c03afb8 |
children | 500731fe8161 |
comparison
equal
deleted
inserted
replaced
34948:2a303c13d125 | 34949:b3288dc18627 |
---|---|
2339 installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \ | 2339 installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \ |
2340 $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \ | 2340 $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \ |
2341 $(DEST_SYN) $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt $(DEST_SYN)/shared \ | 2341 $(DEST_SYN) $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt $(DEST_SYN)/shared \ |
2342 $(DEST_IND) $(DEST_FTP) \ | 2342 $(DEST_IND) $(DEST_FTP) \ |
2343 $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \ | 2343 $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \ |
2344 $(DEST_AUTO)/rust $(DEST_AUTO)/cargo \ | |
2344 $(DEST_IMPORT) $(DEST_IMPORT)/dist \ | 2345 $(DEST_IMPORT) $(DEST_IMPORT)/dist \ |
2345 $(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) | 2346 $(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP) |
2346 -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) | 2347 -$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS) |
2347 # Generate the help tags with ":helptags" to handle all languages. | 2348 # Generate the help tags with ":helptags" to handle all languages. |
2348 # Move the distributed tags file aside and restore it, to avoid it being | 2349 # Move the distributed tags file aside and restore it, to avoid it being |
2426 cd $(DEST_AUTO)/dist; chmod $(HELPMOD) *.vim | 2427 cd $(DEST_AUTO)/dist; chmod $(HELPMOD) *.vim |
2427 cd $(AUTOSOURCE)/xml; $(INSTALL_DATA) *.vim $(DEST_AUTO)/xml | 2428 cd $(AUTOSOURCE)/xml; $(INSTALL_DATA) *.vim $(DEST_AUTO)/xml |
2428 cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim | 2429 cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim |
2429 cd $(AUTOSOURCE)/zig; $(INSTALL_DATA) *.vim $(DEST_AUTO)/zig | 2430 cd $(AUTOSOURCE)/zig; $(INSTALL_DATA) *.vim $(DEST_AUTO)/zig |
2430 cd $(DEST_AUTO)/zig; chmod $(HELPMOD) *.vim | 2431 cd $(DEST_AUTO)/zig; chmod $(HELPMOD) *.vim |
2432 cd $(AUTOSOURCE)/cargo; $(INSTALL_DATA) *.vim $(DEST_AUTO)/cargo | |
2433 cd $(DEST_AUTO)/cargo; chmod $(HELPMOD) *.vim | |
2434 cd $(AUTOSOURCE)/rust; $(INSTALL_DATA) *.vim $(DEST_AUTO)/rust | |
2435 cd $(DEST_AUTO)/rust; chmod $(HELPMOD) *.vim | |
2431 # install the standard import files | 2436 # install the standard import files |
2432 cd $(IMPORTSOURCE)/dist; $(INSTALL_DATA) *.vim $(DEST_IMPORT)/dist | 2437 cd $(IMPORTSOURCE)/dist; $(INSTALL_DATA) *.vim $(DEST_IMPORT)/dist |
2433 cd $(DEST_IMPORT)/dist; chmod $(HELPMOD) *.vim | 2438 cd $(DEST_IMPORT)/dist; chmod $(HELPMOD) *.vim |
2434 # install the standard plugin files | 2439 # install the standard plugin files |
2435 cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG) | 2440 cd $(PLUGSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_PLUG) |
2667 $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt \ | 2672 $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt \ |
2668 $(DEST_IND) $(DEST_FTP) \ | 2673 $(DEST_IND) $(DEST_FTP) \ |
2669 $(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \ | 2674 $(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \ |
2670 $(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \ | 2675 $(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \ |
2671 $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \ | 2676 $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \ |
2677 $(DEST_AUTO)/cargo $(DEST_AUTO)/rust \ | |
2672 $(DEST_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG): | 2678 $(DEST_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG): |
2673 $(MKDIR_P) $@ | 2679 $(MKDIR_P) $@ |
2674 -chmod $(DIRMOD) $@ | 2680 -chmod $(DIRMOD) $@ |
2675 | 2681 |
2676 # Create links from various names to vim. This is only done when the links | 2682 # Create links from various names to vim. This is only done when the links |
2857 -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN)/shared | 2863 -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN)/shared |
2858 -rmdir $(DEST_SYN)/modula2/opt $(DEST_SYN)/modula2 | 2864 -rmdir $(DEST_SYN)/modula2/opt $(DEST_SYN)/modula2 |
2859 -rmdir $(DEST_SYN) $(DEST_IND) | 2865 -rmdir $(DEST_SYN) $(DEST_IND) |
2860 -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict | 2866 -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict |
2861 -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt | 2867 -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt |
2862 -rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim $(DEST_AUTO)/zig/*.vim | 2868 -rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim $(DEST_AUTO)/zig/*.vim $(DEST_AUTO)/cargo/*.vim $(DEST_AUTO)/rust/*.vim |
2863 -rm -f $(DEST_IMPORT)/dist/*.vim | 2869 -rm -f $(DEST_IMPORT)/dist/*.vim |
2864 -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt | 2870 -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt |
2865 -rmdir $(DEST_FTP) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig $(DEST_AUTO) | 2871 -rmdir $(DEST_FTP) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig $(DEST_AUTO)/cargo $(DEST_AUTO)/rust $(DEST_AUTO) |
2866 -rmdir $(DEST_IMPORT)/dist $(DEST_IMPORT) | 2872 -rmdir $(DEST_IMPORT)/dist $(DEST_IMPORT) |
2867 -rmdir $(DEST_PLUG) $(DEST_RT) | 2873 -rmdir $(DEST_PLUG) $(DEST_RT) |
2868 # This will fail when other Vim versions are installed, no worries. | 2874 # This will fail when other Vim versions are installed, no worries. |
2869 -rmdir $(DEST_VIM) | 2875 -rmdir $(DEST_VIM) |
2870 | 2876 |