From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 1 May 2018 14:34:32 +0200
Subject: New upstream version 0.28.2

---
 src/AppDirs.vala | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/AppDirs.vala')

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() {
-- 
cgit v1.2.3