More build fixes. Add a script for presence service.

shell/Makefile.am

@@ -1,10 +1,11 @@
 SUBDIRS = PresenceService data
 
 bin_SCRIPTS = 				\
-	sugar					\
+	sugar				\
 	sugar-activity			\
-	sugar-activity-factory	\
-	sugar-people
+	sugar-activity-factory		\
+	sugar-people			\
+	sugar-presence-service
 
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =				\

shell/PresenceService/Makefile.am

@@ -1,4 +1,4 @@
-sugardir = $(pkgdatadir)/shell
+sugardir = $(pkgdatadir)/shell/PresenceService
 sugar_PYTHON =				\
 	__init__.py			\
 	Activity.py			\

shell/Session.py

@@ -47,13 +47,14 @@ class MatchboxProcess(Process):
 
 class PresenceServiceProcess(Process):
 	def __init__(self):
-		Process.__init__(self, "python shell/PresenceService/PresenceService.py",)
+		Process.__init__(self, "sugar-presence-service",)
 
 	def get_name(self):
 		return "PresenceService"
 
 	def start(self):
 		Process.start(self)
+		# FIXME we really need something better
 		time.sleep(3)
 
 class Session:

shell/data/Makefile.am

@@ -1,7 +1,7 @@
-confdir = $(datadir)
+confdir = $(pkgdatadir)
 conf_DATA = kbdconfig
 
-imagesdir = $(datadir)
+imagesdir = $(pkgdatadir)
 images_DATA =			\
 	home-background.png
 

shell/sugar-presence-service

@@ -0,0 +1,5 @@
+#!/usr/bin/python
+
+from PresenceService import PresenceService
+
+PresenceService.main()