[gnome-games] Move glchess and gnome-sudoku image dirs again from /usr/share/gnome-games/name/ to /usr/share/name

[Robert Ancell <rancell src gnome org>]

commit 5b355363f1c0008b256034913b071f84a42aaef1
Author: Robert Ancell <robert ancell gmail com>
Date:   Fri Jul 17 11:11:34 2009 +1000

    Move glchess and gnome-sudoku image dirs again from /usr/share/gnome-games/name/ to /usr/share/name to match other data

 glchess/src/lib/defaults.py.in      |    6 +++---
 glchess/textures/Makefile.am        |    2 +-
 gnome-sudoku/images/Makefile.am     |    2 +-
 gnome-sudoku/src/lib/defaults.py.in |    8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/glchess/src/lib/defaults.py.in b/glchess/src/lib/defaults.py.in
index b52ff6a..2c0e15a 100644
--- a/glchess/src/lib/defaults.py.in
+++ b/glchess/src/lib/defaults.py.in
@@ -12,10 +12,10 @@ import gettext
 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') 
-    TEXTURE_DIR      = os.path.join(APP_DATA_DIR, 'gnome-games', 'glchess', 'textures')
-    UI_DIR           = os.path.join(APP_DATA_DIR, 'glchess')
+    APP_DATA_DIR     = os.path.join('@prefix@', 'share')
     BASE_DIR         = os.path.join(APP_DATA_DIR, 'glchess')
+    TEXTURE_DIR      = os.path.join(BASE_DIR, 'textures')
+    UI_DIR           = BASE_DIR
     LOCALEDIR        = os.path.join(APP_DATA_DIR, 'locale')
     DATA_DIR         = os.path.expanduser('~/.gnome2/glchess/')
     LOG_DIR          = os.path.join(DATA_DIR, 'logs')
diff --git a/glchess/textures/Makefile.am b/glchess/textures/Makefile.am
index a6cddf0..2e526f1 100644
--- a/glchess/textures/Makefile.am
+++ b/glchess/textures/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = board.png piece.png
 
-pixmapdir = $(pkgdatadir)/glchess/textures
+pixmapdir = $(datadir)/glchess/textures
 pixmap_DATA = board.png piece.png
diff --git a/gnome-sudoku/images/Makefile.am b/gnome-sudoku/images/Makefile.am
index e90d542..625b352 100644
--- a/gnome-sudoku/images/Makefile.am
+++ b/gnome-sudoku/images/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = footprints.png
 
-pixmapdir = $(pkgdatadir)/gnome-sudoku/pixmaps/
+pixmapdir = $(datadir)/gnome-sudoku/images/
 pixmap_DATA = footprints.png
diff --git a/gnome-sudoku/src/lib/defaults.py.in b/gnome-sudoku/src/lib/defaults.py.in
index 6f4d066..eb1d80b 100644
--- a/gnome-sudoku/src/lib/defaults.py.in
+++ b/gnome-sudoku/src/lib/defaults.py.in
@@ -13,11 +13,11 @@ 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, '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')
-    PUZZLE_DIR = os.path.join(APP_DATA_DIR, 'gnome-sudoku', 'puzzles')
+    IMAGE_DIR = os.path.join(BASE_DIR, 'images')
+    LOCALEDIR = os.path.join(APP_DATA_DIR, 'locale')
+    UI_DIR = BASE_DIR
+    PUZZLE_DIR = os.path.join(BASE_DIR, 'puzzles')
 else:
     # Running in uninstalled mode
     sys.path.insert(0, os.path.abspath(root_dir))