From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 2 Mar 2010 20:07:50 +0000 (+0200)
Subject: Install and look for plugins in plugins/, not modules/ (fixes: #3352)
X-Git-Tag: 1.1.0-pre1~567
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4ac9513cfdcf97af9776575b312267b0e785b386;p=vlc

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

diff --git a/modules/common.am b/modules/common.am
index 0c995a1d96..2e617cecff 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,7 @@
 
 NULL =
 SUFFIXES =
-libvlcdir = $(vlclibdir)/modules/$(basedir)
+libvlcdir = $(vlclibdir)/plugins/$(basedir)
 EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/Makefile.am b/src/Makefile.am
index 43a3805366..8b1a16da61 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,7 +190,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DPKGLIBDIR=\"$(vlclibdir)\" \
-	-DPLUGIN_PATH=PKGLIBDIR\"/modules\"
+	-DPLUGIN_PATH=PKGLIBDIR\"/plugins\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 894168fa06..ccbd1575bf 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -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" );
 
     /* 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 )
         vlc_array_append( arraypaths, path );
 #ifndef WIN32