summaryrefslogtreecommitdiff
path: root/src/AppDirs.vala
diff options
context:
space:
mode:
Diffstat (limited to 'src/AppDirs.vala')
-rw-r--r--src/AppDirs.vala13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 0c69270..ffea859 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -260,9 +260,18 @@ class AppDirs {
public static File get_lib_dir() {
File? install_dir = get_install_dir();
+
+ // Running from source tree
+ if (install_dir == null) {
+ // Meson build
+ if (get_exec_dir().get_path().has_suffix("src")) {
+ return get_exec_dir().get_parent();
+ }
+
+ return get_exec_dir();
+ }
- return (install_dir != null) ? install_dir.get_child(Resources.LIB).get_child("shotwell")
- : get_exec_dir();
+ return install_dir.get_child(Resources.LIB).get_child("shotwell");
}
public static File get_system_plugins_dir() {