[vlc-commits] commit: Install and look for plugins in plugins/, not modules/ (fixes: #3352) ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar  2 22:07:50 2010 +0200| [4ac9513cfdcf97af9776575b312267b0e785b386] | committer: Rémi Denis-Courmont 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ac9513cfdcf97af9776575b312267b0e785b386
---

 modules/common.am     |    2 +-
 src/Makefile.am       |    2 +-
 src/modules/modules.c |    4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/common.am b/modules/common.am
index 0c995a1..2e617ce 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 43a3805..8b1a16d 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 894168f..ccbd157 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