[gnome-games] Fix path substitution

[Christian Persch <chpe src gnome org>]

commit 8359799af38fa25d0c5f76603b7457f6984fa09d
Author: Christian Persch <chpe gnome org>
Date:   Fri Nov 6 20:50:43 2009 +0100

    Fix path substitution
    
    Mentioned in bug #600921 comment 5.

 configure.in               |    4 ----
 lightsoff/Makefile.am      |    6 ++++++
 lightsoff/src/Path.js.in   |    2 +-
 lightsoff/src/lightsoff.in |    5 ++---
 swell-foop/Makefile.am     |    6 ++++++
 swell-foop/src/Path.js.in  |    2 +-
 swell-foop/swell-foop.in   |    5 ++---
 7 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/configure.in b/configure.in
index 8c76da7..0f7545d 100644
--- a/configure.in
+++ b/configure.in
@@ -1143,9 +1143,7 @@ gnome-sudoku/help/Makefile
 swell-foop/data/themes/Makefile
 swell-foop/data/themes/tango/Makefile
 swell-foop/data/themes/test/Makefile
-swell-foop/swell-foop
 swell-foop/swell-foop.desktop.in
-swell-foop/src/Path.js
 quadrapassel/quadrapassel.desktop.in
 gnobots2/gnobots2.desktop.in
 gnibbles/gnibbles.desktop.in
@@ -1159,9 +1157,7 @@ gnect/data/gnect.desktop.in
 gnomine/gnomine.desktop.in
 lightsoff/Makefile
 lightsoff/help/Makefile
-lightsoff/src/lightsoff
 lightsoff/lightsoff.desktop.in
-lightsoff/src/Path.js
 lightsoff/data/themes/Makefile
 lightsoff/data/themes/tango/Makefile
 lightsoff/data/themes/up/Makefile
diff --git a/lightsoff/Makefile.am b/lightsoff/Makefile.am
index 27aa6a6..2061a25 100644
--- a/lightsoff/Makefile.am
+++ b/lightsoff/Makefile.am
@@ -22,6 +22,12 @@ lightsoff_DATA = \
 bin_SCRIPTS = \
 	src/lightsoff
 
+src/lightsoff: src/lightsoff.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
+
+src/Path.js: src/Path.js.in
+	$(AM_V_GEN) $(SED) -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
+
 schema_in_files = lightsoff.schemas.in
 if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/lightsoff/src/Path.js.in b/lightsoff/src/Path.js.in
index 7675357..8e0c0db 100644
--- a/lightsoff/src/Path.js.in
+++ b/lightsoff/src/Path.js.in
@@ -1 +1 @@
-file_prefix = '@prefix@' + "/share/gnome-games/lightsoff/";
+file_prefix = '%pkgdatadir%' + "/lightsoff/";
diff --git a/lightsoff/src/lightsoff.in b/lightsoff/src/lightsoff.in
index 62f3a15..9fbf401 100644
--- a/lightsoff/src/lightsoff.in
+++ b/lightsoff/src/lightsoff.in
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
 
-export LD_LIBRARY_PATH= libdir@/gnome-games:$LD_LIBRARY_PATH
-/usr/bin/env seed @prefix@/share/gnome-games/lightsoff/main.js
-
+export LD_LIBRARY_PATH=%pkglibdir%:$LD_LIBRARY_PATH
+/usr/bin/env seed %pkgdatadir%/lightsoff/main.js
diff --git a/swell-foop/Makefile.am b/swell-foop/Makefile.am
index fc6799d..64e1941 100644
--- a/swell-foop/Makefile.am
+++ b/swell-foop/Makefile.am
@@ -20,6 +20,12 @@ swell_DATA = \
 
 bin_SCRIPTS = swell-foop
 
+swell-foop: swell-foop.in Makefile
+	$(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
+
+src/Path.js: src/Path.js.in
+	$(AM_V_GEN) $(SED) -e "s|%pkgdatadir%|$(pkgdatadir)|" $< > $@
+
 schema_in_files = swell-foop.schemas.in
 if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/swell-foop/src/Path.js.in b/swell-foop/src/Path.js.in
index a442001..fa90d7e 100644
--- a/swell-foop/src/Path.js.in
+++ b/swell-foop/src/Path.js.in
@@ -1 +1 @@
-var file_prefix = '@prefix@' + "/share/gnome-games/swell-foop/";
+var file_prefix = '%pkgdatadir%' + "/swell-foop/";
diff --git a/swell-foop/swell-foop.in b/swell-foop/swell-foop.in
index d509cd0..93bbddb 100644
--- a/swell-foop/swell-foop.in
+++ b/swell-foop/swell-foop.in
@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
 
-export LD_LIBRARY_PATH= libdir@/gnome-games:$LD_LIBRARY_PATH
-/usr/bin/env seed @prefix@/share/gnome-games/swell-foop/main.js
-
+export LD_LIBRARY_PATH=%pkglibdir%:$LD_LIBRARY_PATH
+/usr/bin/env seed %pkgdatadir%/swell-foop/main.js