Put plugins in $(pkglibdir)/modules
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 14 Feb 2010 18:04:08 +0000 (20:04 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 14 Feb 2010 18:50:18 +0000 (20:50 +0200)
We can now store other architecture-dependant files in $(pkglibdir)
(and without bugging the plugins scan).

modules/Makefile.am
modules/common.am
src/Makefile.am

index 5b4aec4..6c2dfcc 100644 (file)
@@ -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
index 64d9a22..4eaeb42 100644 (file)
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(vlclibdir)/$(basedir)
+libvlcdir = $(vlclibdir)/modules/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
index 2f7663d..8468da0 100644 (file)
@@ -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 \