[hamster-applet] store services in libdir, not bindir where they are just making confusion

[Toms Baugis <tbaugis src gnome org>]

commit 845b9f06ca95c37cefa93c0a533c541a36dc2f3d
Author: Toms BauÄis <toms baugis gmail com>
Date:   Sat Feb 11 16:13:31 2012 +0200

    store services in libdir, not bindir where they are just making confusion

 org.gnome.hamster.Windows.service.in |    2 +-
 org.gnome.hamster.service.in         |    2 +-
 wscript                              |   11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/org.gnome.hamster.Windows.service.in b/org.gnome.hamster.Windows.service.in
index 8d3946b..645abad 100644
--- a/org.gnome.hamster.Windows.service.in
+++ b/org.gnome.hamster.Windows.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Hamster.WindowServer
-Exec= prefix@/bin/hamster-windows-service
+Exec= LIBDIR@/hamster-applet/hamster-windows-service
diff --git a/org.gnome.hamster.service.in b/org.gnome.hamster.service.in
index f0bb9f2..5fd3ac1 100644
--- a/org.gnome.hamster.service.in
+++ b/org.gnome.hamster.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.Hamster
-Exec= prefix@/bin/hamster-service
+Exec= LIBDIR@/hamster-applet/hamster-service
diff --git a/wscript b/wscript
index 38da6f2..6312b77 100644
--- a/wscript
+++ b/wscript
@@ -43,12 +43,17 @@ def set_options(opt):
 
 
 def build(bld):
-    bld.install_files('${LIBDIR}/hamster-applet', 'src/hamster-applet', chmod = 0755)
+    bld.install_files('${LIBDIR}/hamster-applet',
+                      """src/hamster-applet
+                         src/hamster-service
+                         src/hamster-windows-service
+                      """,
+                      chmod = 0755)
+    
     bld.install_files('${BINDIR}',
                       """src/hamster-time-tracker
                          src/hamster-cli
-                         src/hamster-service
-                         src/hamster-windows-service""",
+                      """,
                       chmod = 0755)
     bld.symlink_as('${BINDIR}/gnome-time-tracker', 'hamster-time-tracker')