From 87bea07447dd98e87345e52890e29e2002c6990c Mon Sep 17 00:00:00 2001
From: Nedko Arnaudov <nedko@arnaudov.name>
Date: Mon, 13 Jul 2009 02:18:06 +0300
Subject: [PATCH] Install D-Bus service file

---
 daemon/dbus.service.in            |  3 +++
 daemon/org.nongnu.lash.service.in |  3 ---
 wscript                           | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 daemon/dbus.service.in
 delete mode 100644 daemon/org.nongnu.lash.service.in

diff --git a/daemon/dbus.service.in b/daemon/dbus.service.in
new file mode 100644
index 00000000..f1967ead
--- /dev/null
+++ b/daemon/dbus.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=@dbus_object_path@
+Exec=@daemon_bin_path@
diff --git a/daemon/org.nongnu.lash.service.in b/daemon/org.nongnu.lash.service.in
deleted file mode 100644
index c083311b..00000000
--- a/daemon/org.nongnu.lash.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.nongnu.LASH
-Exec=@bindir@/lashd
diff --git a/wscript b/wscript
index dd524f2e..ac5424a2 100644
--- a/wscript
+++ b/wscript
@@ -7,6 +7,7 @@ import Utils
 
 APPNAME='ladish'
 VERSION='1'
+DBUS_NAME_BASE = 'org.nongnu.LASH'
 
 # these variables are mandatory ('/' are converted automatically)
 srcdir = '.'
@@ -143,14 +144,15 @@ def build(bld):
 
     daemon.source.append(os.path.join("common", "safety.c"))
 
-    # process org.jackaudio.service.in -> org.jackaudio.service
-    #import misc
-    #obj = bld.new_task_gen('subst')
-    #obj.source = 'org.jackaudio.service.in'
-    #obj.target = 'org.jackaudio.service'
-    #obj.dict = {'BINDIR': bld.env['PREFIX'] + '/bin'}
-    #obj.install_path = '${DBUS_SERVICES_DIR}/'
-    #obj.fun = misc.subst_func
+    # process name.arnaudov.nedko.ladish.service.in -> name.arnaudov.nedko.ladish.service
+    import misc
+    obj = bld.new_task_gen('subst')
+    obj.source = os.path.join('daemon', 'dbus.service.in')
+    obj.target = DBUS_NAME_BASE + '.service'
+    obj.dict = {'dbus_object_path': DBUS_NAME_BASE,
+                'daemon_bin_path': os.path.join(bld.env['PREFIX'], 'bin', daemon.target)}
+    obj.install_path = bld.env['DBUS_SERVICES_DIR'] + os.path.sep
+    obj.fun = misc.subst_func
 
     liblash = bld.new_task_gen('cc', 'shlib')
     liblash.includes = "build/default" # XXX config.h version.h and other generated files