[vlc-commits] Generate plugins cache during staged (native) installation

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Aug 17 19:25:25 2011 +0300| [c96ea5799237914985e4c48b6758c4040b8dd7d6] | committer: Rémi Denis-Courmont

Generate plugins cache during staged (native) installation

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

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

diff --git a/modules/Makefile.am b/modules/Makefile.am
index f739ecc..3b3664d 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -75,10 +75,10 @@ stamp-cache:
 	fi
 
 install-exec-hook:
-	if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
-		LD_LIBRARY_PATH="$(libdir)" \
-		"$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-			 "$(vlclibdir)/plugins" ; \
+	if test "$(build)" = "$(host)"; then \
+		LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
+		"$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
+			 "$(DESTDIR)$(vlclibdir)/plugins" ; \
 	else \
-		echo "Staged installation: cache generation skipped!" ; \
+		echo "Cross-compilation: cache generation skipped!" ; \
 	fi