Generate plugins cache during staged (native) installation

diff --git a/modules/Makefile.am b/modules/Makefile.am
index f739ecc88f520fbd50cf06c94bb178bd3846978c..3b3664d701aae2055759bb399ab066c39fd71d46 100644 (file)
--- 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