diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2019-03-23 09:01:30 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2019-03-23 09:01:30 (GMT) |
| commit | fd0df8f884336fc69bd0938453f9712c166f08c8 (patch) | |
| tree | f24313aa72a50d41b8076cf6b257129530bf562e /plugins/pychrysalide | |
| parent | 03d5e6abfce49d4a18bbf70cbbaa3be8c58bf5b4 (diff) | |
Removed references to local sources if required.
Diffstat (limited to 'plugins/pychrysalide')
| -rw-r--r-- | plugins/pychrysalide/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/pychrysalide/pychrysa.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/plugins/pychrysalide/Makefile.am b/plugins/pychrysalide/Makefile.am index d9194b9..25c3e40 100644 --- a/plugins/pychrysalide/Makefile.am +++ b/plugins/pychrysalide/Makefile.am @@ -1,5 +1,5 @@ -pkglib_LTLIBRARIES = pychrysalide.la +lib_LTLIBRARIES = pychrysalide.la libdir = $(pluginslibdir) diff --git a/plugins/pychrysalide/pychrysa.c b/plugins/pychrysalide/pychrysa.c index 3e14add..f9cdad5 100644 --- a/plugins/pychrysalide/pychrysa.c +++ b/plugins/pychrysalide/pychrysa.c @@ -579,6 +579,12 @@ static void load_python_plugins(GPluginModule *plugin) /* Définition des zones d'influence */ +#ifndef DISCARD_LOCAL + + extend_python_path(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "python"); + +#else + dir = opendir(PLUGINS_DATA_DIR G_DIR_SEPARATOR_S "python"); if (dir != NULL) @@ -586,8 +592,8 @@ static void load_python_plugins(GPluginModule *plugin) closedir(dir); extend_python_path(PLUGINS_DATA_DIR G_DIR_SEPARATOR_S "python"); } - else - extend_python_path(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "python"); + +#endif g_plugin_module_log_variadic_message(plugin, LMT_INFO, _("PYTHONPATH environment variable set to '%s'"), |