diff --git a/modules/common.am b/modules/common.am index 0c995a1d9626937d06a99e2321515cefc78936ff..2e617cecffd1096b826c0de933e434c8c0a03d02 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 43a3805366c4e62b23770757cb9fec42afe71146..8b1a16da61a0b1f7fb6b71d2be4ba438ed262186 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 894168fa06e78b77a4798376fffa72b10a2d9b8f..ccbd1575bfdc693d665d98def9ad6f4ac0911d0f 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 /modules and /plugins. */ + * executable. Set it to /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