Install to blueman-rfcomm-watcher to libexecdir instead of bindir

blueman-project · Mar 5, 2015 · 473ab54 · 473ab54
1 parent 7f6ac6c
commit 473ab54
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ install-sh
 .deps
 Constants.py
 /blueman/main/applet/BluezAgent.py
+/blueman/plugins/mechanism/Rfcomm.py
 _blueman.c
 po/Makefile.in.in
 po/.intltool-merge-cache

diff --git a/apps/Makefile.am b/apps/Makefile.am
@@ -2,7 +2,6 @@ APPS =					\
 	blueman-adapters	\
 	blueman-applet		\
 	blueman-manager		\
-	blueman-rfcomm-watcher \
 	blueman-services	\
 	blueman-sendto		\
 	blueman-assistant	\
@@ -15,5 +14,8 @@ apps_SCRIPTS = $(APPS)
 polkitdir = $(libexecdir)
 polkit_SCRIPTS = 	\
 	blueman-mechanism
+
+helpersdir = $(libexecdir)
+helpers_SCRIPTS = blueman-rfcomm-watcher
 
-EXTRA_DIST = $(APPS) blueman-mechanism
+EXTRA_DIST = $(APPS) blueman-mechanism blueman-rfcomm-watcher
diff --git a/blueman/plugins/mechanism/Rfcomm.py → blueman/plugins/mechanism/Rfcomm.py.in b/blueman/plugins/mechanism/Rfcomm.py → blueman/plugins/mechanism/Rfcomm.py.in
@@ -10,7 +10,7 @@ class Rfcomm(MechanismPlugin):
 
     @dbus.service.method('org.blueman.Mechanism', in_signature="d")
     def open_rfcomm(self, port_id):
-        subprocess.Popen(['blueman-rfcomm-watcher', '/dev/rfcomm%d' % port_id])
+        subprocess.Popen(['@LIBEXECDIR@/blueman-rfcomm-watcher', '/dev/rfcomm%d' % port_id])
 
     @dbus.service.method('org.blueman.Mechanism', in_signature="d")
     def close_rfcomm(self, port_id):

diff --git a/configure.ac b/configure.ac
@@ -196,6 +196,7 @@ blueman/plugins/Makefile
 blueman/plugins/services/Makefile
 blueman/plugins/applet/Makefile
 blueman/plugins/mechanism/Makefile
+blueman/plugins/mechanism/Rfcomm.py
 blueman/plugins/manager/Makefile
 blueman/plugins/config/Makefile
 blueman/main/Makefile