patch 9.0.0241: "make install" does not install shared syntax file

Problem:    "make install" does not install shared syntax file. (James McCoy)
Solution:   Install and uninstall the shared syntax files. (closes #10956)

diff --git a/src/Makefile b/src/Makefile
index 95fe0d4495f5ffcef1f834f76b873b1daed6954b..177bc08df2b03dbb7ecaeeceab07c021ab7f7965 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2451,6 +2451,8 @@ installrtbase: $(HELPSOURCE)/vim.1 $(DEST_VIM) $(DEST_RT) \
 # install the syntax files
        cd $(SYNSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)
        cd $(DEST_SYN); chmod $(HELPMOD) *.vim README.txt
+       cd $(SYNSOURCE)/shared; $(INSTALL_DATA) *.vim README.txt $(DEST_SYN)/shared
+       cd $(DEST_SYN)/shared; chmod $(HELPMOD) *.vim README.txt
 # install the indent files
        cd $(INDSOURCE); $(INSTALL_DATA) *.vim README.txt $(DEST_IND)
        cd $(DEST_IND); chmod $(HELPMOD) *.vim README.txt
@@ -2696,7 +2698,8 @@ $(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
 
 $(DESTDIR)$(exec_prefix) $(DEST_BIN) \
                $(DEST_VIM) $(DEST_RT) $(DEST_HELP) \
-               $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND) $(DEST_FTP) \
+               $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_SYN)/shared \
+               $(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 \
@@ -2872,6 +2875,7 @@ uninstall_runtime:
        -rm -f $(DEST_COL)/*.vim $(DEST_COL)/README.txt
        -rm -rf $(DEST_COL)/tools
        -rm -rf $(DEST_COL)/lists
+       -rm -f $(DEST_SYN)/shared/*.vim $(DEST_SYN)/shared/README.txt
        -rm -f $(DEST_SYN)/*.vim $(DEST_SYN)/README.txt
        -rm -f $(DEST_IND)/*.vim $(DEST_IND)/README.txt
        -rm -rf $(DEST_MACRO)
@@ -2883,7 +2887,8 @@ uninstall_runtime:
        -rm -rf $(DEST_KMAP)
        -rm -rf $(DEST_COMP)
        -rm -f $(DEST_PRINT)/*.ps
-       -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN) $(DEST_IND)
+       -rmdir $(DEST_HELP) $(DEST_PRINT) $(DEST_COL) $(DEST_SYN)/shared
+       -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

diff --git a/src/version.c b/src/version.c
index 9e77abceea2cc93c633ee561c5144c4063957a0b..9e0c64cddd57b7ac7c20a47807c543ac4cff93a2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -731,6 +731,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    241,
 /**/
     240,
 /**/