From 680ac1896a9764b14c77e3a636508afe5067f46b Mon Sep 17 00:00:00 2001
From: coderkun <olli@coderkun.de>
Date: Sat, 6 May 2017 16:38:14 +0200
Subject: [PATCH] Fix distributing and loading of data files

---
 mcg/__init__.py | 12 +++++++++---
 setup.py        | 12 +++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mcg/__init__.py b/mcg/__init__.py
index e7b27ba..20eb436 100644
--- a/mcg/__init__.py
+++ b/mcg/__init__.py
@@ -9,12 +9,18 @@ import os
 
 # Set environment
 srcdir = os.path.abspath(os.path.dirname(__file__))
-datadir = os.path.join(srcdir, '..', 'data')
-localedir = os.path.join(srcdir, '..', 'locale')
+datadir = os.path.join(srcdir, 'data')
+datadirdev = os.path.join(srcdir, '..', 'data')
+if os.path.exists(datadirdev):
+    datadir = datadirdev
+localedir = None
+localedirdev = os.path.join(srcdir, '..', 'locale')
+if os.path.exists(localedirdev):
+    localedir = datadirdev
 
 # Set GSettings schema dir (if not set already)
 if not os.environ.get('GSETTINGS_SCHEMA_DIR'):
-    os.environ['GSETTINGS_SCHEMA_DIR'] = datadir
+    os.environ['GSETTINGS_SCHEMA_DIR'] = datadirdev
 
 
 
diff --git a/setup.py b/setup.py
index 06eb4eb..bb8ec03 100644
--- a/setup.py
+++ b/setup.py
@@ -60,15 +60,20 @@ setup(
     author_email = "olli@coderkun.de",
     license = "GPL",
     packages = [
-        "mcg"
+        'mcg',
+        'mcg/data'
     ],
     package_dir = {
-        'mcg': 'mcg'
+        'mcg': 'mcg',
+        'mcg/data': 'data'
     },
     package_data = {
         'mcg': [
             'LICENSE',
             'README.textile'
+        ],
+        'mcg/data': [
+            'de.coderkun.mcg.gresource'
         ]
     },
     install_requires = [
@@ -92,9 +97,6 @@ setup(
         (os.path.join('share', 'glib-2.0', 'schemas'), [
             "data/de.coderkun.mcg.gschema.xml"
         ]),
-        (os.path.join('share', 'mcg'), [
-            "data/de.coderkun.mcg.gresource",
-        ]),
         (os.path.join('share', 'locale', 'en', 'LC_MESSAGES'), [
             'locale/en/LC_MESSAGES/mcg.mo'
         ]),