[gnome-games/gnome-3-4] swell-foop: Install into /usr/share/swell-foop not /usr/share/gnome-games

[Robert Ancell <rancell src gnome org>]

commit d36d12df8d235ea3d426cde462f2c72b414f1eed
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri May 4 13:45:37 2012 +1200

    swell-foop: Install into /usr/share/swell-foop not /usr/share/gnome-games

 swell-foop/data/Makefile.am                        |    2 +-
 swell-foop/data/themes/colors/Makefile.am          |    2 +-
 swell-foop/data/themes/shapesandcolors/Makefile.am |    2 +-
 swell-foop/src/Makefile.am                         |    4 ++--
 swell-foop/src/config.vapi                         |    2 +-
 swell-foop/src/game-view.vala                      |    2 +-
 swell-foop/src/swell-foop.vala                     |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/swell-foop/data/Makefile.am b/swell-foop/data/Makefile.am
index 29d2d0a..9245e58 100644
--- a/swell-foop/data/Makefile.am
+++ b/swell-foop/data/Makefile.am
@@ -5,7 +5,7 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
-swelldir=$(pkgdatadir)/swell-foop
+swelldir=$(datadir)/swell-foop
 swell_DATA = \
     preferences.ui
 
diff --git a/swell-foop/data/themes/colors/Makefile.am b/swell-foop/data/themes/colors/Makefile.am
index 16467bf..c6532ed 100644
--- a/swell-foop/data/themes/colors/Makefile.am
+++ b/swell-foop/data/themes/colors/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/swell-foop/themes/colors
+themedir = $(datadir)/swell-foop/themes/colors
 theme_DATA = \
 	bkg.svg \
 	blue.svg \
diff --git a/swell-foop/data/themes/shapesandcolors/Makefile.am b/swell-foop/data/themes/shapesandcolors/Makefile.am
index ca7c22e..96c42f8 100644
--- a/swell-foop/data/themes/shapesandcolors/Makefile.am
+++ b/swell-foop/data/themes/shapesandcolors/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/swell-foop/themes/shapesandcolors
+themedir = $(datadir)/swell-foop/themes/shapesandcolors
 theme_DATA = \
 	bkg.svg \
 	blue.svg \
diff --git a/swell-foop/src/Makefile.am b/swell-foop/src/Makefile.am
index dc9cd50..a6d6f2a 100644
--- a/swell-foop/src/Makefile.am
+++ b/swell-foop/src/Makefile.am
@@ -17,8 +17,8 @@ swell_foop_CFLAGS = \
 	-I$(top_srcdir)/libgames-support \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DPKGDATADIR=\""$(pkgdatadir)/swell-foop"\" \
-	-DLOCALEDIR=\"$(pkgdatadir)/locale\" \
+	-DDATADIR=\""$(datadir)/swell-foop"\" \
+	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GHTREAD_CFLAGS) \
 	$(GMODULE_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/swell-foop/src/config.vapi b/swell-foop/src/config.vapi
index a1787ca..9116fad 100644
--- a/swell-foop/src/config.vapi
+++ b/swell-foop/src/config.vapi
@@ -1,4 +1,4 @@
-public const string PKGDATADIR;
+public const string DATADIR;
 public const string LOCALEDIR;
 public const string GETTEXT_PACKAGE;
 public const string VERSION;
diff --git a/swell-foop/src/game-view.vala b/swell-foop/src/game-view.vala
index d1f5fb5..3c87964 100644
--- a/swell-foop/src/game-view.vala
+++ b/swell-foop/src/game-view.vala
@@ -245,7 +245,7 @@ public class Theme
         try
         {
             for (int i = 0; i < 4; i++)
-                textures[i] = new Clutter.Texture.from_file (Path.build_filename (PKGDATADIR, "themes", name, colors[i] + ".svg"));
+                textures[i] = new Clutter.Texture.from_file (Path.build_filename (DATADIR, "themes", name, colors[i] + ".svg"));
         }
         catch (Clutter.TextureError e)
         {
diff --git a/swell-foop/src/swell-foop.vala b/swell-foop/src/swell-foop.vala
index c937646..01b0741 100644
--- a/swell-foop/src/swell-foop.vala
+++ b/swell-foop/src/swell-foop.vala
@@ -229,7 +229,7 @@ public class SwellFoop : Gtk.Application
         var preferences_builder = new Gtk.Builder ();
         try
         {
-            preferences_builder.add_from_file (Path.build_filename (PKGDATADIR, "preferences.ui", null));
+            preferences_builder.add_from_file (Path.build_filename (DATADIR, "preferences.ui", null));
         }
         catch (Error e)
         {