Skip to content

Commit fc1dabd

Browse files
mhammerlychrisbra
authored andcommitted
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 <[email protected]> Signed-off-by: Christian Brabandt <[email protected]>
1 parent 014b775 commit fc1dabd

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

src/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,6 +2341,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
23412341
$(DEST_SYN) $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt $(DEST_SYN)/shared \
23422342
$(DEST_IND) $(DEST_FTP) \
23432343
$(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \
2344+
$(DEST_AUTO)/rust $(DEST_AUTO)/cargo \
23442345
$(DEST_IMPORT) $(DEST_IMPORT)/dist \
23452346
$(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP)
23462347
-$(SHELL) ./installman.sh install $(DEST_MAN) "" $(INSTALLMANARGS)
@@ -2428,6 +2429,10 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
24282429
cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim
24292430
cd $(AUTOSOURCE)/zig; $(INSTALL_DATA) *.vim $(DEST_AUTO)/zig
24302431
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
24312436
# install the standard import files
24322437
cd $(IMPORTSOURCE)/dist; $(INSTALL_DATA) *.vim $(DEST_IMPORT)/dist
24332438
cd $(DEST_IMPORT)/dist; chmod $(HELPMOD) *.vim
@@ -2669,6 +2674,7 @@ $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
26692674
$(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \
26702675
$(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \
26712676
$(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \
2677+
$(DEST_AUTO)/cargo $(DEST_AUTO)/rust \
26722678
$(DEST_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG):
26732679
$(MKDIR_P) $@
26742680
-chmod $(DIRMOD) $@
@@ -2859,10 +2865,10 @@ uninstall_runtime:
28592865
-rmdir $(DEST_SYN) $(DEST_IND)
28602866
-rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict
28612867
-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
28632869
-rm -f $(DEST_IMPORT)/dist/*.vim
28642870
-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)
28662872
-rmdir $(DEST_IMPORT)/dist $(DEST_IMPORT)
28672873
-rmdir $(DEST_PLUG) $(DEST_RT)
28682874
# This will fail when other Vim versions are installed, no worries.

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
331,
707709
/**/
708710
330,
709711
/**/

0 commit comments

Comments
 (0)