patch 9.1.0434: make errors trying to access autoload/zig

Problem:  make errors trying to access autoload/zig
Solution: Remove autoload/zig from Makefile, adjust Filelist
          (Derek Schrock)

Commit d1d9316c6 removed autoload/zig/ files and install/uninstall target
of the Makefile fail since the directory doesn't exist any longer.

closes: #14828

Signed-off-by: Derek Schrock <dereks@lifeofadishwasher.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/Filelist b/Filelist
index 46bcdb4bc26d8796302cbefb2161c81641c5d1d1..20c19f762348758995f0d15b6bbfcbd991f6b7eb 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -806,7 +806,6 @@ RT_SCRIPTS =        \
                runtime/autoload/dist/*.vim \
                runtime/autoload/rust/*.vim \
                runtime/autoload/xml/*.vim \
-               runtime/autoload/zig/*.vim \
                runtime/colors/*.vim \
                runtime/colors/README.txt \
                runtime/colors/lists/*.vim \

diff --git a/src/Makefile b/src/Makefile
index 0d202142827352d91e4251c3926cbfd3c893eda6..71578eb8074b11638763365ea818afbf83955b88 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2343,7 +2343,7 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
                $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) \
                $(DEST_SYN) $(DEST_SYN)/modula2 $(DEST_SYN)/modula2/opt $(DEST_SYN)/shared \
                $(DEST_IND) $(DEST_FTP) \
-               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \
+               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
                $(DEST_AUTO)/rust $(DEST_AUTO)/cargo \
                $(DEST_IMPORT) $(DEST_IMPORT)/dist \
                $(DEST_PLUG) $(DEST_TUTOR) $(DEST_SPELL) $(DEST_COMP)
@@ -2430,8 +2430,6 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(VIMTARGET) $(DEST_RT) \
        cd $(DEST_AUTO)/dist; chmod $(HELPMOD) *.vim
        cd $(AUTOSOURCE)/xml; $(INSTALL_DATA) *.vim $(DEST_AUTO)/xml
        cd $(DEST_AUTO)/xml; chmod $(HELPMOD) *.vim
-       cd $(AUTOSOURCE)/zig; $(INSTALL_DATA) *.vim $(DEST_AUTO)/zig
-       cd $(DEST_AUTO)/zig; chmod $(HELPMOD) *.vim
        cd $(AUTOSOURCE)/cargo; $(INSTALL_DATA) *.vim $(DEST_AUTO)/cargo
        cd $(DEST_AUTO)/cargo; chmod $(HELPMOD) *.vim
        cd $(AUTOSOURCE)/rust; $(INSTALL_DATA) *.vim $(DEST_AUTO)/rust
@@ -2676,7 +2674,7 @@ $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
                $(DEST_IND) $(DEST_FTP) \
                $(DEST_LANG) $(DEST_KMAP) $(DEST_COMP) $(DEST_MACRO) \
                $(DEST_PACK) $(DEST_TOOLS) $(DEST_TUTOR) $(DEST_SPELL) \
-               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig \
+               $(DEST_AUTO) $(DEST_AUTO)/dist $(DEST_AUTO)/xml \
                $(DEST_AUTO)/cargo $(DEST_AUTO)/rust \
                $(DEST_IMPORT) $(DEST_IMPORT)/dist $(DEST_PLUG):
        $(MKDIR_P) $@
@@ -2868,10 +2866,10 @@ uninstall_runtime:
        -rmdir $(DEST_SYN) $(DEST_IND)
        -rm -rf $(DEST_FTP)/*.vim $(DEST_FTP)/README.txt $(DEST_FTP)/logtalk.dict
        -rm -f $(DEST_AUTO)/*.vim $(DEST_AUTO)/README.txt
-       -rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim $(DEST_AUTO)/zig/*.vim $(DEST_AUTO)/cargo/*.vim $(DEST_AUTO)/rust/*.vim
+       -rm -f $(DEST_AUTO)/dist/*.vim $(DEST_AUTO)/xml/*.vim $(DEST_AUTO)/cargo/*.vim $(DEST_AUTO)/rust/*.vim
        -rm -f $(DEST_IMPORT)/dist/*.vim
        -rm -f $(DEST_PLUG)/*.vim $(DEST_PLUG)/README.txt
-       -rmdir $(DEST_FTP) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/zig $(DEST_AUTO)/cargo $(DEST_AUTO)/rust $(DEST_AUTO)
+       -rmdir $(DEST_FTP) $(DEST_AUTO)/dist $(DEST_AUTO)/xml $(DEST_AUTO)/cargo $(DEST_AUTO)/rust $(DEST_AUTO)
        -rmdir $(DEST_IMPORT)/dist $(DEST_IMPORT)
        -rmdir $(DEST_PLUG) $(DEST_RT)
 #      This will fail when other Vim versions are installed, no worries.

diff --git a/src/version.c b/src/version.c
index c4bccb447ec542cd3762d7eb3525b97e972d1049..61cb7af316a23b349d4218e7bdd1b15fe0e445c4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    434,
 /**/
     433,
 /**/