summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2019-05-30 23:28:49 +0200
committerDavid Runge <dave@sleepmap.de>2019-05-30 23:28:49 +0200
commit1b3269d525a63ed5d9b4c9f5f218677443c7206a (patch)
treed0ed9bc50f380b97fbd0f8aa17b37ed8a45a8498
parentb15fe0d62653d39f2793f14e65fb6ea6ea5968aa (diff)
downloadjack2-1b3269d525a63ed5d9b4c9f5f218677443c7206a.tar.gz
wscript: Setting SYSTEMD_USER_UNIT_DIR to None, if the option is not set (the options seem not to be available in build later on.... hopefully conf.env is.
-rw-r--r--wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/wscript b/wscript
index e4de16ce..f73a16d6 100644
--- a/wscript
+++ b/wscript
@@ -269,6 +269,9 @@ def configure(conf):
if conf.env['IS_LINUX']:
if Options.options.systemd_unit:
conf.recurse('systemd')
+ else:
+ conf.env['SYSTEMD_USER_UNIT_DIR'] = None
+
conf.recurse('example-clients')
@@ -773,8 +776,7 @@ def build(bld):
bld.recurse('example-clients')
if bld.env['IS_LINUX']:
bld.recurse('man')
- if Options.options.systemd_unit:
- bld.recurse('systemd')
+ bld.recurse('systemd')
if not bld.env['IS_WINDOWS']:
bld.recurse('tests')
if bld.env['BUILD_JACKDBUS']: