Commit 4ac9513c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Install and look for plugins in plugins/, not modules/ (fixes: #3352)

parent 8902488b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
NULL = NULL =
SUFFIXES = SUFFIXES =
libvlcdir = $(vlclibdir)/modules/$(basedir) libvlcdir = $(vlclibdir)/plugins/$(basedir)
EXTRA_DIST = Modules.am EXTRA_DIST = Modules.am
BUILT_SOURCES = BUILT_SOURCES =
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
......
...@@ -190,7 +190,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \ ...@@ -190,7 +190,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
-DDATA_PATH=\"$(vlcdatadir)\" \ -DDATA_PATH=\"$(vlcdatadir)\" \
-DLIBDIR=\"$(libdir)\" \ -DLIBDIR=\"$(libdir)\" \
-DPKGLIBDIR=\"$(vlclibdir)\" \ -DPKGLIBDIR=\"$(vlclibdir)\" \
-DPLUGIN_PATH=PKGLIBDIR\"/modules\" -DPLUGIN_PATH=PKGLIBDIR\"/plugins\"
libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \ libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
-no-undefined \ -no-undefined \
-export-symbols $(srcdir)/libvlccore.sym \ -export-symbols $(srcdir)/libvlccore.sym \
......
...@@ -819,10 +819,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank ) ...@@ -819,10 +819,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank )
const bool b_reset = var_InheritBool( p_this, "reset-plugins-cache" ); const bool b_reset = var_InheritBool( p_this, "reset-plugins-cache" );
/* Contruct the special search path for system that have a relocatable /* Contruct the special search path for system that have a relocatable
* executable. Set it to <vlc path>/modules and <vlc path>/plugins. */ * executable. Set it to <vlc path>/plugins. */
if( vlcpath && asprintf( &path, "%s" DIR_SEP "modules", vlcpath ) != -1 )
vlc_array_append( arraypaths, path );
if( vlcpath && asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 ) if( vlcpath && asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 )
vlc_array_append( arraypaths, path ); vlc_array_append( arraypaths, path );
#ifndef WIN32 #ifndef WIN32
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment