[gnome-games/sudoku-tube] Fix build/install

[Zhang Sen <zhangsen src gnome org>]

commit 1d2cdae6d78572c83086900a99582ba20c0f4dff
Author: Zhang Sen <zh jesse gmail com>
Date:   Sat Aug 15 12:42:06 2009 +0800

    Fix build/install
    
    Makefile patch from Thomas, thanks :)

 gnome-sudoku/data/Makefile.am                      |    4 ++++
 ...mpathy.DTubeHandler.org.gnome.Sudoku.service.in |    4 ++--
 gnome-sudoku/src/gnome-sudoku.in.in                |    6 +++---
 gnome-sudoku/src/lib/Makefile.am                   |    3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/gnome-sudoku/data/Makefile.am b/gnome-sudoku/data/Makefile.am
index ec4ef8e..1b722af 100644
--- a/gnome-sudoku/data/Makefile.am
+++ b/gnome-sudoku/data/Makefile.am
@@ -20,6 +20,9 @@ dbusservice_in_files = \
 dbusservicedir = $(datadir)/dbus-1/services
 dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 
+%.service: %.service.in Makefile
+	sed -e "s|%bindir%|$(bindir)|" $< > $@
+
 schema_in_files = gnome-sudoku.schemas.in
 if HAVE_GNOME
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
@@ -44,6 +47,7 @@ EXTRA_DIST = \
 	$(schema_in_files)
 
 CLEANFILES = \
+	$(dbusservice_DATA)	\
 	$(schema_DATA)
 
 DISTCLEANFILES = \
diff --git a/gnome-sudoku/data/org.gnome.Empathy.DTubeHandler.org.gnome.Sudoku.service.in b/gnome-sudoku/data/org.gnome.Empathy.DTubeHandler.org.gnome.Sudoku.service.in
index 309d26e..6ca056e 100644
--- a/gnome-sudoku/data/org.gnome.Empathy.DTubeHandler.org.gnome.Sudoku.service.in
+++ b/gnome-sudoku/data/org.gnome.Empathy.DTubeHandler.org.gnome.Sudoku.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Empathy.DTubeHandler.org_gnome_sudoku
-Exec=/usr/bin/gnome-sudoku
+Name=org.gnome.Empathy.DTubeHandler.org_gnome_Sudoku
+Exec=%bindir%/gnome-sudoku
diff --git a/gnome-sudoku/src/gnome-sudoku.in.in b/gnome-sudoku/src/gnome-sudoku.in.in
index 49028cb..40899d7 100644
--- a/gnome-sudoku/src/gnome-sudoku.in.in
+++ b/gnome-sudoku/src/gnome-sudoku.in.in
@@ -38,7 +38,7 @@ import sys
 
 try:
     # Import gnome-sudoku module from source distribution.
-    import lib;
+    import lib
     sys.modules["gnome_sudoku"] = sys.modules["lib"];
     from gnome_sudoku.gnome_sudoku import start_game
 
@@ -47,8 +47,8 @@ except ImportError:
       # Import gnome-sudoku from pyexecdir or system installation.
       from gnome_sudoku.gnome_sudoku import start_game
 
-    except ImportError:
-      # Import of gnome-sudoku failed. Show error message.
+    except ImportError as err:
+      print "Import of gnome-sudoku failed:", err
       import gtk
       import os.path
       import gettext
diff --git a/gnome-sudoku/src/lib/Makefile.am b/gnome-sudoku/src/lib/Makefile.am
index cc90323..32083f8 100644
--- a/gnome-sudoku/src/lib/Makefile.am
+++ b/gnome-sudoku/src/lib/Makefile.am
@@ -29,4 +29,5 @@ gnomesudoku_PYTHON = \
 	tp_tube.py	\
 	tracker_box.py	\
 	tube_handler.py	\
-	view.py
+	view.py		\
+	undo.py