Generate plugins cache during staged (native) installation

Chao-1412 · Aug 17, 2011 · c96ea57 · c96ea57
1 parent 0a2f90d
commit c96ea57
Showing 1 changed file with 5 additions and 5 deletions.
diff --git 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