Get rid of PLUGIN_PATH

diff --git a/src/Makefile.am b/src/Makefile.am
index ee4eac8fef732b483bfaa014959af474e71c3400..b8d8b41cf7dc36775f5cff72ec633445d92a1e26 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -188,8 +188,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
-       -DPKGLIBDIR=\"$(vlclibdir)\" \
-       -DPLUGIN_PATH=PKGLIBDIR\"/plugins\"
+       -DPKGLIBDIR=\"$(vlclibdir)\"
 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 c1de228bb828289660bad0d78a50ef442892470f..1e4a4dfaa7188c324170b8525a08f7738bf09a87 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -820,12 +820,10 @@ static void AllocateAllPlugins( vlc_object_t *p_this, module_bank_t *p_bank )
 
     /* Contruct the special search path for system that have a relocatable
      * executable. Set it to <vlc path>/plugins. */
+    assert( vlcpath );
 
-    if( vlcpath && asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 )
+    if( asprintf( &path, "%s" DIR_SEP "plugins", vlcpath ) != -1 )
         vlc_array_append( arraypaths, path );
-#if !defined(WIN32) && !defined(__APPLE__)
-    vlc_array_append( arraypaths, strdup( PLUGIN_PATH ) );
-#endif
 
     /* If the user provided a plugin path, we add it to the list */
     char *userpaths = var_InheritString( p_this, "plugin-path" );