[vlc-commits] Run installed vlc-cache-gen rather than build-tree libtool script

Rémi Denis-Courmont git at videolan.org
Sun Jun 19 19:15:00 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jun 19 20:13:41 2011 +0300| [f2ede7bb08ca84fe2fbd17a4263a9275159b82fa] | committer: Rémi Denis-Courmont

Run installed vlc-cache-gen rather than build-tree libtool script

This ensures we use the installed libvlc(core) run-time, and might
fix some obscure crashes.

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

 modules/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/Makefile.am b/modules/Makefile.am
index b551eb5..b84f2d9 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -74,7 +74,9 @@ stamp-cache:
 
 install-exec-hook:
 	if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
-		../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
+		LD_LIBRARY_PATH="$(libdir)" \
+		"$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+			 "$(vlclibdir)/plugins" ; \
 	else \
 		echo "Staged installation: cache generation skipped!" ; \
 	fi



More information about the vlc-commits mailing list