[gnome-games] Move pixmap install dir for gnome-sudoku and glchess from /usr/share/pixmaps/name to /usr/share/gnom

[Robert Ancell <rancell src gnome org>]

commit 078e396fb2e63ffac1e9602e2cacaf723ee7f2e3
Author: Robert Ancell <robert ancell gmail com>
Date:   Thu Jul 9 22:07:21 2009 +1000

    Move pixmap install dir for gnome-sudoku and glchess from /usr/share/pixmaps/name to /usr/share/gnome-games/name/pixmaps to be consistent with the other games

 glchess/src/lib/defaults.py.in      |    4 +---
 glchess/textures/Makefile.am        |    2 +-
 gnome-sudoku/images/Makefile.am     |    2 +-
 gnome-sudoku/src/lib/defaults.py.in |    4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/glchess/src/lib/defaults.py.in b/glchess/src/lib/defaults.py.in
index 7a699e0..2f05b46 100644
--- a/glchess/src/lib/defaults.py.in
+++ b/glchess/src/lib/defaults.py.in
@@ -13,8 +13,7 @@ root_dir = os.path.dirname(__file__)
 if not os.path.exists(os.path.join(root_dir, 'Makefile.am')):
     # Running in installed mode
     APP_DATA_DIR     = os.path.join('@prefix@', 'share') 
-    ICON_DIR         = os.path.join(APP_DATA_DIR, 'pixmaps')
-    TEXTURE_DIR      = os.path.join(ICON_DIR, 'glchess')
+    TEXTURE_DIR      = os.path.join(APP_DATA_DIR, 'gnome-games', 'glchess', 'pixmaps')
     UI_DIR           = os.path.join(APP_DATA_DIR, 'glchess')
     BASE_DIR         = os.path.join(APP_DATA_DIR, 'glchess')
     LOCALEDIR        = os.path.join(APP_DATA_DIR, 'locale')
@@ -29,7 +28,6 @@ if not os.path.exists(os.path.join(root_dir, 'Makefile.am')):
 else:
     # Running in uninstalled mode
     APP_DATA_DIR     = os.path.join(root_dir, '../../data')
-    ICON_DIR         = os.path.join(root_dir, '../../textures')
     TEXTURE_DIR      = os.path.join(root_dir, '../../textures')
     UI_DIR           = os.path.join(root_dir, '../../data')
     BASE_DIR         = os.path.join(root_dir, '../../data')
diff --git a/glchess/textures/Makefile.am b/glchess/textures/Makefile.am
index 5e1c7e9..332620d 100644
--- a/glchess/textures/Makefile.am
+++ b/glchess/textures/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = board.png piece.png
 
-pixmapdir = $(datadir)/pixmaps/glchess/
+pixmapdir = $(pkgdatadir)/glchess/pixmaps
 pixmap_DATA = board.png piece.png
diff --git a/gnome-sudoku/images/Makefile.am b/gnome-sudoku/images/Makefile.am
index 5fd73e1..e90d542 100644
--- a/gnome-sudoku/images/Makefile.am
+++ b/gnome-sudoku/images/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = footprints.png
 
-pixmapdir = $(datadir)/pixmaps/gnome-sudoku/
+pixmapdir = $(pkgdatadir)/gnome-sudoku/pixmaps/
 pixmap_DATA = footprints.png
diff --git a/gnome-sudoku/src/lib/defaults.py.in b/gnome-sudoku/src/lib/defaults.py.in
index 6842ba7..6f4d066 100644
--- a/gnome-sudoku/src/lib/defaults.py.in
+++ b/gnome-sudoku/src/lib/defaults.py.in
@@ -12,8 +12,8 @@ import gettext
 root_dir = os.path.dirname(os.path.dirname(__file__))
 if not os.path.exists(os.path.join(root_dir, "Makefile.am")):
     # Running in installed mode
-    APP_DATA_DIR = os.path.join('@prefix@', 'share') 
-    IMAGE_DIR = os.path.join(APP_DATA_DIR, 'pixmaps', 'gnome-sudoku')
+    APP_DATA_DIR = os.path.join('@prefix@', 'share')
+    IMAGE_DIR = os.path.join(APP_DATA_DIR, 'gnome-games', 'gnome-sudoku', 'pixmaps')
     LOCALEDIR = os.path.join(APP_DATA_DIR, 'locale')
     UI_DIR = os.path.join(APP_DATA_DIR, 'gnome-sudoku')
     BASE_DIR = os.path.join(APP_DATA_DIR, 'gnome-sudoku')