patch 9.1.1055: make install fails because of a missing dependency

Problem:  make install fails because of a missing dependency
Solution: add explicit dependencies for tutor/{en,it}
          (Sergei Trofimovich)

Without the change `make install -j16` fails
sometimes due to race condition to create a directory.

It's best reproducible with `make --shuffle`:

    $ make install --shuffle
    ...
    bash install-sh -c -d /vim-9.1.0990/share/vim/vim91/tutor
    chmod 755 /vim-9.1.0990/share/vim/vim91/tutor
    cp ../runtime/tutor/README* ../runtime/tutor/tutor* /vim-9.1.0990/share/vim/vim91/tutor
    cp ../runtime/tutor/en/* /vim-9.1.0990/share/vim/vim91/tutor/en/
    cp: target '/vim-9.1.0990/share/vim/vim91/tutor/en/': No such file or directory
    make[1]: [Makefile:2487: installtutor] Error 1 (ignored) shuffle=2340321974
    cp ../runtime/tutor/it/* /vim-9.1.0990/share/vim/vim91/tutor/it/
    cp: target '/vim-9.1.0990/share/vim/vim91/tutor/it/': No such file or directory
    make[1]: [Makefile:2488: installtutor] Error 1 (ignored) shuffle=2340321974

The fix adds a dependency on targeted directories used to install tutor.

Before the change it too 2-3 attempts to reproduce the install failure.
After the change `vim` survives 150 install attempts without failures.

closes: #16531

Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index 19d1dca9b113ef80578492ac0407c215598de114..3e9a2403e408b752cb9898af6c193683290eea6f 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2482,7 +2482,7 @@ installgtutorbin: $(DEST_BIN)
        $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
        chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor
 
-installtutor: $(DEST_RT) $(DEST_TUTOR)
+installtutor: $(DEST_RT) $(DEST_TUTOR)/en $(DEST_TUTOR)/it
        -$(INSTALL_DATA) $(TUTORSOURCE)/README* $(TUTORSOURCE)/tutor* $(DEST_TUTOR)
        -$(INSTALL_DATA) $(TUTORSOURCE)/en/* $(DEST_TUTOR)/en/
        -$(INSTALL_DATA) $(TUTORSOURCE)/it/* $(DEST_TUTOR)/it/

diff --git a/src/version.c b/src/version.c
index f1455002f5f5be8a651206164588a641572afda9..450bcdfaabe5b6e1d64325c0101c683c85d3332d 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 */
+/**/
+    1055,
 /**/
     1054,
 /**/