[gnome-games] lightsoff: Install into /usr/share/lightsoff not /usr/share/gnome-games



commit fd21b3fff28e69db33ebc18d1e45ff45a5e94b98
Author: Robert Ancell <robert ancell canonical com>
Date:   Thu Feb 2 09:42:51 2012 +1100

    lightsoff: Install into /usr/share/lightsoff not /usr/share/gnome-games

 lightsoff/data/Makefile.am   |    2 +-
 lightsoff/src/Makefile.am    |    2 +-
 lightsoff/src/config.vapi    |    2 +-
 lightsoff/src/game-view.vala |   12 ++++++------
 lightsoff/src/lightsoff.vala |    2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/lightsoff/data/Makefile.am b/lightsoff/data/Makefile.am
index 43fcff6..c4439a8 100644
--- a/lightsoff/data/Makefile.am
+++ b/lightsoff/data/Makefile.am
@@ -1,4 +1,4 @@
-lightsoffdir = $(pkgdatadir)/lightsoff
+lightsoffdir = $(datadir)/lightsoff
 lightsoff_DATA = \
 	lightsoff.ui \
 	arrow.svg \
diff --git a/lightsoff/src/Makefile.am b/lightsoff/src/Makefile.am
index b842d89..b2515cd 100644
--- a/lightsoff/src/Makefile.am
+++ b/lightsoff/src/Makefile.am
@@ -20,7 +20,7 @@ lightsoff_CFLAGS = \
 	-I$(top_srcdir)/libgames-support \
 	-DVERSION=\"$(VERSION)\" \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-	-DPKGDATADIR=\""$(pkgdatadir)/lightsoff"\" \
+	-DDATADIR=\""$(datadir)/lightsoff"\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	$(GHTREAD_CFLAGS) \
 	$(GMODULE_CFLAGS) \
diff --git a/lightsoff/src/config.vapi b/lightsoff/src/config.vapi
index 19e8616..a8a1476 100644
--- a/lightsoff/src/config.vapi
+++ b/lightsoff/src/config.vapi
@@ -1,7 +1,7 @@
 [CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
 namespace Config
 {
-  public const string PKGDATADIR;
+  public const string DATADIR;
   public const string GETTEXT_PACKAGE;
   public const string VERSION;
   public const string LOCALEDIR;
diff --git a/lightsoff/src/game-view.vala b/lightsoff/src/game-view.vala
index 77f2b0c..e64550a 100644
--- a/lightsoff/src/game-view.vala
+++ b/lightsoff/src/game-view.vala
@@ -34,12 +34,12 @@ public class GameView : Clutter.Group
     {
         try
         {
-            backing_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "backing.svg"));
-            highlight_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "highlight.svg"));
-            off_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "off.svg"));
-            on_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "on.svg"));
-            led_back_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "led-back.svg"));
-            arrow_texture = new Clutter.Texture.from_file (Path.build_filename (Config.PKGDATADIR, "arrow.svg"));
+            backing_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "backing.svg"));
+            highlight_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "highlight.svg"));
+            off_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "off.svg"));
+            on_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "on.svg"));
+            led_back_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "led-back.svg"));
+            arrow_texture = new Clutter.Texture.from_file (Path.build_filename (Config.DATADIR, "arrow.svg"));
         }
         catch (Clutter.TextureError e)
         {
diff --git a/lightsoff/src/lightsoff.vala b/lightsoff/src/lightsoff.vala
index a0dd300..835252f 100644
--- a/lightsoff/src/lightsoff.vala
+++ b/lightsoff/src/lightsoff.vala
@@ -14,7 +14,7 @@ public class LightsOff : Gtk.Application
         ui = new Gtk.Builder();
         try
         {
-            ui.add_from_file (Path.build_filename (Config.PKGDATADIR, "lightsoff.ui"));
+            ui.add_from_file (Path.build_filename (Config.DATADIR, "lightsoff.ui"));
         }
         catch (Error e)
         {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]