Install data to new location

13 files changed, 40 insertions, 30 deletions

diff --git a/autogen.sh b/autogen.sh
index 72fbe878a..776f47d7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
   CONF_ARGS=""
 
   echo "[encoding: UTF-8]" > po/POTFILES.in \
-  && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
+  && for p in `ls gajim/data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
   gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \
diff --git a/configure.ac b/configure.ac
index 528da7752..03ec71a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,12 +54,13 @@ AC_SUBST(PACKAGE)
 AC_CONFIG_FILES([ 
 	Makefile
 	data/Makefile
-	data/gui/Makefile
-	data/emoticons/Makefile
+	gajim/data/Makefile
+	gajim/data/gui/Makefile
+	gajim/data/emoticons/Makefile
 	data/pixmaps/Makefile
-	data/iconsets/Makefile
-	data/moods/Makefile
-	data/activities/Makefile
+	gajim/data/iconsets/Makefile
+	gajim/data/moods/Makefile
+	gajim/data/activities/Makefile
 	icons/Makefile
 	data/org.gajim.Gajim.appdata.xml
 	data/org.gajim.Gajim.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 2e22a4932..3b02d6d18 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gui emoticons pixmaps iconsets moods activities
+SUBDIRS = pixmaps
 @INTLTOOL_DESKTOP_RULE@
 
 appstreamdir = $(datadir)/metainfo/
@@ -13,25 +13,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 installdefsdir = $(gajim_srcdir)/common
 installdefs_DATA = defs.py
 
-soundsdir = $(pkgdatadir)/data/sounds
-sounds_DATA = $(srcdir)/sounds/*.wav
-
-styledir = $(pkgdatadir)/data/style
-style_DATA = $(srcdir)/style/*.css
-
-otherdir = $(pkgdatadir)/data/other
-other_DATA = other/servers.xml other/dh4096.pem
-# other/cacert.pem is used only on Windows. On Unix platforms
-# use CA certificates installed in /etc/ssl/certs
 
 man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
 
 
 EXTRA_DIST = $(appstream_in_files) \
 			 $(desktop_in_files) \
-			 $(sounds_DATA) \
-			 $(style_DATA) \
-			 $(other_DATA) \
 			 $(man_MANS) \
 			 defs.py.in
 
diff --git a/gajim/Makefile.am b/gajim/Makefile.am
index 6bf92b1bd..c9bfb66bb 100644
--- a/gajim/Makefile.am
+++ b/gajim/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = data
+
 INCLUDES = \
 	$(PYTHON_INCLUDES)
 export MACOSX_DEPLOYMENT_TARGET=10.4
diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py
index dc40d0969..20871109d 100644
--- a/gajim/common/configpaths.py
+++ b/gajim/common/configpaths.py
@@ -98,9 +98,11 @@ class ConfigPaths:
                 base = expand('~/.local/share')
             self.data_root = os.path.join(base, 'gajim')
 
-        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
+        import pkg_resources
+        basedir = pkg_resources.resource_filename("gajim", ".")
         self.add('DATA', None, os.path.join(basedir, 'data'))
         self.add('GUI', None, os.path.join(basedir, 'data', 'gui'))
+        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
         self.add('ICONS', None, os.path.join(basedir, 'icons'))
         self.add('HOME', None, os.path.expanduser('~'))
         self.add('PLUGINS_BASE', None, os.path.join(basedir, 'plugins'))
diff --git a/gajim/data/Makefile.am b/gajim/data/Makefile.am
new file mode 100644
index 000000000..bee085790
--- /dev/null
+++ b/gajim/data/Makefile.am
@@ -0,0 +1,19 @@
+SUBDIRS = gui emoticons iconsets moods activities
+@INTLTOOL_DESKTOP_RULE@
+
+soundsdir = $(gajim_srcdir)/data/sounds
+sounds_DATA = $(srcdir)/sounds/*.wav
+
+styledir = $(gajim_srcdir)/data/style
+style_DATA = $(srcdir)/style/*.css
+
+otherdir = $(gajim_srcdir)/data/other
+other_DATA = other/servers.xml other/dh4096.pem
+# other/cacert.pem is used only on Windows. On Unix platforms
+# use CA certificates installed in /etc/ssl/certs
+
+EXTRA_DIST = $(sounds_DATA) \
+			 $(style_DATA) \
+			 $(other_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/gajim/data/activities/Makefile.am b/gajim/data/activities/Makefile.am
index a0f242a53..12f725a6b 100644
--- a/gajim/data/activities/Makefile.am
+++ b/gajim/data/activities/Makefile.am
@@ -1,4 +1,4 @@
-activitiesdir = $(pkgdatadir)/data/activities
+activitiesdir = $(gajim_srcdir)/data/activities
 nobase_dist_activities_DATA = $(srcdir)/*/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/gajim/data/emoticons/Makefile.am b/gajim/data/emoticons/Makefile.am
index 96bd7b843..417267dd6 100644
--- a/gajim/data/emoticons/Makefile.am
+++ b/gajim/data/emoticons/Makefile.am
@@ -1,4 +1,4 @@
-emoticonsdir = $(pkgdatadir)/data/emoticons
+emoticonsdir = $(gajim_srcdir)/data/emoticons
 nobase_dist_emoticons_DATA = \
 	$(srcdir)/*/*.png \
 	$(srcdir)/*/LICENSE \
diff --git a/gajim/data/gui/Makefile.am b/gajim/data/gui/Makefile.am
index b36d5d7fe..a0908cec3 100644
--- a/gajim/data/gui/Makefile.am
+++ b/gajim/data/gui/Makefile.am
@@ -1,5 +1,4 @@
-
-guidir = $(pkgdatadir)/data/gui
+guidir = $(gajim_srcdir)/data/gui
 gui_DATA = $(srcdir)/*.ui
 EXTRA_DIST = $(gui_DATA)
 
diff --git a/gajim/data/iconsets/Makefile.am b/gajim/data/iconsets/Makefile.am
index d83643525..a938009f1 100644
--- a/gajim/data/iconsets/Makefile.am
+++ b/gajim/data/iconsets/Makefile.am
@@ -1,4 +1,4 @@
-iconsetdir = $(pkgdatadir)/data/iconsets
+iconsetdir = $(gajim_srcdir)/data/iconsets
 nobase_dist_iconset_DATA = \
 	$(srcdir)/*/16x16/* \
 	$(srcdir)/*/32x32/* \
diff --git a/gajim/data/moods/Makefile.am b/gajim/data/moods/Makefile.am
index 174466374..2e579b47d 100644
--- a/gajim/data/moods/Makefile.am
+++ b/gajim/data/moods/Makefile.am
@@ -1,4 +1,4 @@
-moodsdir = $(pkgdatadir)/data/moods
+moodsdir = $(gajim_srcdir)/data/moods
 nobase_dist_moods_DATA = $(srcdir)/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/test/lib/__init__.py b/test/lib/__init__.py
index b8c60c8fe..78a2602c2 100644
--- a/test/lib/__init__.py
+++ b/test/lib/__init__.py
@@ -46,13 +46,13 @@ def setup_env():
     import logging
     logging.basicConfig()
 
-    app.DATA_DIR = gajim_root + '/data'
+    app.DATA_DIR = gajim_root + '/gajim/data'
     app.use_x = use_x
     app.contacts = LegacyContactsAPI()
     app.connections = {}
 
     if use_x:
         from gajim import gtkgui_helpers
-        gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui'
+        gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui'
         from gajim.gajim import GajimApplication
         app.app = GajimApplication()
diff --git a/test/test_pluginmanager.py b/test/test_pluginmanager.py
index 71f99d987..50b9c0392 100644
--- a/test/test_pluginmanager.py
+++ b/test/test_pluginmanager.py
@@ -55,7 +55,7 @@ gajim.common.configpaths.gajimpaths.init(configdir)
 # for some reason common.app needs to be imported before xmpppy?
 from gajim.common import app
 
-app.DATA_DIR = gajim_root + '/data'
+app.DATA_DIR = gajim_root + '/gajim/data'
 
 from common.stanza_session import StanzaSession