diff --git a/src/shell/main.c b/src/shell/main.c index 5d089225ca..030908d684 100644 --- a/src/shell/main.c +++ b/src/shell/main.c @@ -407,7 +407,15 @@ create_default_shell (void) } /* Load all shared library modules. */ - module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR); + const gchar *modules_directory = EVOLUTION_MODULEDIR; + const gchar *modules_directory_env; + + modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR"); + if (modules_directory_env && + g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR)) + modules_directory = g_strdup (modules_directory_env); + + module_types = e_module_load_all_in_directory (modules_directory); g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse); flags = G_APPLICATION_HANDLES_OPEN |