diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
| commit | e230b6f78546827521107be23797048482c8b193 (patch) | |
| tree | 948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/AppDirs.vala | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | 49120f48474fc8fdc2448c75d961bc238213cfac (diff) | |
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/AppDirs.vala')
| -rw-r--r-- | src/AppDirs.vala | 13 |
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() { |