From f846111160b9c9825f3acc01029f3106d1fcf142 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Sun, 9 Jan 2022 20:42:12 +0100
Subject: [PATCH] Move jack_control to dbus (#831)

* Move jack_control to dbus dir

dbus/jack_control:
The `jack_control` script is dbus specific and not part of the original
jack tools. As the files offered by jack-example-tools are now
optionally not built, the script needs to be made available from a
location, that is not ignored when omitting the build of
jack-example-tools files.

* Move installation of jack_control to dbus integration

dbus/wscript:
Install `jack_control` script if building/installing jackdbus.

tools/wscript:
Remove (unconditional) installation of `jack_control` script.
---
 {tools => dbus}/jack_control | 0
 dbus/wscript                 | 3 +++
 tools/wscript                | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename {tools => dbus}/jack_control (100%)

diff --git a/tools/jack_control b/dbus/jack_control
similarity index 100%
rename from tools/jack_control
rename to dbus/jack_control
diff --git a/dbus/wscript b/dbus/wscript
index e10e6cfa..77dae58c 100644
--- a/dbus/wscript
+++ b/dbus/wscript
@@ -89,3 +89,6 @@ def build(bld):
             target = 'org.jackaudio.service',
             install_path = '${DBUS_SERVICES_DIR}/',
             BINDIR = bld.env['PREFIX'] + '/bin')
+
+    if not bld.env['IS_WINDOWS']:
+        bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755)
diff --git a/tools/wscript b/tools/wscript
index 54735b57..bf9eaf21 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -114,4 +114,3 @@ def build(bld):
 
     if not bld.env['IS_WINDOWS']:
         bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
-        bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755)