[gnome-games] gnotravex: Merge pixmaps into data directory

[Robert Ancell <rancell src gnome org>]

commit 3150cc9746f25d2e88f93f45dc63f129cd4fcd03
Author: Robert Ancell <robert ancell canonical com>
Date:   Mon Nov 14 10:05:07 2011 +1100

    gnotravex: Merge pixmaps into data directory

 configure.in                          |    1 -
 gnotravex/Makefile.am                 |    2 +-
 gnotravex/data/Makefile.am            |    4 ++++
 gnotravex/{pixmaps => data}/baize.png |  Bin 470 -> 470 bytes
 gnotravex/pixmaps/Makefile.am         |    6 ------
 5 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/configure.in b/configure.in
index 65fe620..f2cc752 100644
--- a/configure.in
+++ b/configure.in
@@ -869,7 +869,6 @@ gnotravex/data/Makefile
 gnotravex/data/gnotravex.desktop.in
 gnotravex/src/Makefile
 gnotravex/help/Makefile
-gnotravex/pixmaps/Makefile
 gnotski/Makefile
 gnotski/help/Makefile
 glines/Makefile
diff --git a/gnotravex/Makefile.am b/gnotravex/Makefile.am
index db6a20e..06a52d0 100644
--- a/gnotravex/Makefile.am
+++ b/gnotravex/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = pixmaps
+SUBDIRS = data src
 
 if BUILD_HELP
 SUBDIRS += help
diff --git a/gnotravex/data/Makefile.am b/gnotravex/data/Makefile.am
index 2589d05..1faca71 100644
--- a/gnotravex/data/Makefile.am
+++ b/gnotravex/data/Makefile.am
@@ -1,3 +1,6 @@
+imagedir = $(pkgdatadir)/pixmaps
+image_DATA = baize.png
+
 desktop_in_files = gnotravex.desktop.in.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
@@ -11,6 +14,7 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 man_MANS = gnotravex.6
 
 EXTRA_DIST = \
+	$(image_DATA) \
 	$(gsettings_in_file) \
 	$(man_MANS)
     
diff --git a/gnotravex/pixmaps/baize.png b/gnotravex/data/baize.png
similarity index 100%
rename from gnotravex/pixmaps/baize.png
rename to gnotravex/data/baize.png