Merge branch 'mbakke/zathura-plugindir' into develop

This commit is contained in:
Sebastian Ramacher 2018-05-26 09:45:43 +02:00
commit 4e222933cc

View File

@ -624,6 +624,8 @@ zathura_set_plugin_dir(zathura_t* zathura, const char* dir)
if (dir != NULL) {
set_plugin_dir(zathura, dir);
} else if (g_getenv("ZATHURA_PLUGIN_PATH") != NULL) {
set_plugin_dir(zathura, g_getenv("ZATHURA_PLUGIN_PATH"));
#ifdef ZATHURA_PLUGINDIR
} else {
set_plugin_dir(zathura, ZATHURA_PLUGINDIR);