[pybliographer/wip/gtk3: 42/42] data: Move desktop and appdata to data dir

[Germán Poo-Caamaño <gpoo src gnome org>]

commit ad540e1265dcf821ca372afd211710e1f7c1d350
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Fri Oct 6 22:16:34 2017 -0300

    data: Move desktop and appdata to data dir

 Makefile.am                                        |   33 +++++--------------
 Pyblio/version.py.in                               |    2 +-
 data/Makefile.am                                   |   19 +++++++++++
 .../pybliographic.appdata.xml.in                   |    0
 .../pybliographic.desktop.in                       |    0
 5 files changed, 29 insertions(+), 25 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c5fd54e..172c52d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,40 +21,25 @@
 
 pybdir  = $(datadir)/$(PACKAGE)
 
-SUBDIRS =      . Pyblio                \
-               scripts         \
-               tests           \
-               Styles          \
-               po              \
-               help            \
-               data
+SUBDIRS = \
+       Pyblio          \
+       scripts         \
+       tests           \
+       Styles          \
+       po              \
+       help            \
+       data
 
 bin_SCRIPTS = pybliographer
 
 pyb_DATA = pybrc.py
 
-desktopdir = $(datadir)/applications
-desktop_in_files = pybliographic.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-%.desktop: %.desktop.in Makefile
-       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-appdatadir = $(datadir)/appdata
-appdata_in_files = pybliographic.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-%.xml: %.xml.in Makefile
-       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
 EXTRA_DIST = \
        pybliographer.in                \
-       $(appdata_in_files) \
-       $(desktop_in_files) \
        $(pyb_DATA)
 
 CLEANFILES = \
-       pybliographer \
-       $(desktop_DATA) \
-       $(appdata_DATA)
+       pybliographer
 
 DISTCLEANFILES =
 
diff --git a/Pyblio/version.py.in b/Pyblio/version.py.in
index df1d3f9..920f42c 100644
--- a/Pyblio/version.py.in
+++ b/Pyblio/version.py.in
@@ -11,7 +11,7 @@ if _installed:
     pybdir = '@datapyb@'
     localedir = '@locale_dir@'
     version = '@version@'
-    pixmapsdir = '@pixmapsdir@'
+    pixmapsdir = os.path.join(pybdir, 'pixmaps')
 else:
     datadir = os.path.join(_topdir, 'data')
     pybdir = _topdir
diff --git a/data/Makefile.am b/data/Makefile.am
index 1b3b4be..e481eb7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,3 +2,22 @@ SUBDIRS =      icons   \
                pixmaps \
                src
 
+desktopdir = $(datadir)/applications
+desktop_in_files = pybliographic.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+%.desktop: %.desktop.in Makefile
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+
+appdatadir = $(datadir)/appdata
+appdata_in_files = pybliographic.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+%.xml: %.xml.in Makefile
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
+
+EXTRA_DIST = \
+       $(appdata_in_files) \
+       $(desktop_in_files)
+
+CLEANFILES = \
+       $(desktop_DATA) \
+       $(appdata_DATA)
diff --git a/pybliographic.appdata.xml.in b/data/pybliographic.appdata.xml.in
similarity index 100%
rename from pybliographic.appdata.xml.in
rename to data/pybliographic.appdata.xml.in
diff --git a/pybliographic.desktop.in b/data/pybliographic.desktop.in
similarity index 100%
rename from pybliographic.desktop.in
rename to data/pybliographic.desktop.in