Fix race between installation and execution of vlc-cache-gen

diff --git a/Makefile.am b/Makefile.am
index e2815c4e2236d27b89bb7b1fa2a0bd361dbc645c..264e796ed8cbc906e9eafa00607b93b558bf1796 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -404,6 +404,18 @@ noinst_DATA = VLC.app
 endif
 endif
 
+###############################################################################
+# Installing plugins cache
+###############################################################################
+install-exec-hook:
+       if test "$(build)" = "$(host)"; then \
+               LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
+               "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+                        "$(DESTDIR)$(vlclibdir)/plugins" ; \
+       else \
+               echo "Cross-compilation: cache generation skipped!" ; \
+       fi
+
 silentstd = $(silentstd_$(V))
 silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 18b33c2dc7e06b9eb59157c7fca217de97fc1f2d..86d7f65596e39a5e12f8fe22340af8f4612fb570 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -84,12 +84,3 @@ MOSTLYCLEANFILES = $(noinst_DATA)
        else \
                echo "Cross-compilation: cache generation skipped!" ; \
        fi
-
-install-exec-hook:
-       if test "$(build)" = "$(host)"; then \
-               LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
-               "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-                        "$(DESTDIR)$(vlclibdir)/plugins" ; \
-       else \
-               echo "Cross-compilation: cache generation skipped!" ; \
-       fi