[vlc-commits] Fix race between installation and execution of vlc-cache-gen

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Sep  1 20:07:41 2011 +0300| [b6c4de7c1675ebce1d81ce5c4f059036eb3da341] | committer: Rémi Denis-Courmont

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b6c4de7c1675ebce1d81ce5c4f059036eb3da341
---

 Makefile.am     |   12 ++++++++++++
 bin/Makefile.am |    9 ---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e2815c4..264e796 100644
--- 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 18b33c2..86d7f65 100644
--- 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