Put plugins in $(pkglibdir)/modules

We can now store other architecture-dependant files in $(pkglibdir)
(and without bugging the plugins scan).

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5b4aec4d55de5c8e71c150217719a43c58d56d2d..6c2dfccb68a8dfcbe7f2c58c79ab3011a759ca24 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -71,7 +71,7 @@ stamp-cache:
 
 install-exec-hook:
        if test -z "$(DESTDIR)"; then \
-               ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)" ; \
+               ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/modules" ; \
        else \
                echo "Staged installation: cache generation skipped!" ; \
        fi

diff --git a/modules/common.am b/modules/common.am
index 64d9a22f454910fff9b673e5a119c35d08fb19bf..4eaeb42bd1954d4b2462a899e90c727044903402 100644 (file)
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(vlclibdir)/$(basedir)
+libvlcdir = $(vlclibdir)/modules/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2f7663db0063c149add4399e5fe7aad61a45131d..8468da07b2693fb4acb23f06e4393f29bcf3930e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -192,7 +192,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
        -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)\"
+       -DPLUGIN_PATH=\"$(vlclibdir)/modules\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \