summaryrefslogtreecommitdiffstats
path: root/meson.build
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-05-05 19:37:13 -0400
committerLibravatar GitHub <noreply@github.com>2018-05-05 19:37:13 -0400
commiteda57e7761485f08c1bde0ef3e6a619d1b48348e (patch)
treefbe3642dfd9b4cf78240099decda61a7b52097ea /meson.build
parentMerge pull request #1917 from RyanDwyer/pango-markup (diff)
parentRevert "Install swaybar and swaybg under /usr/lib/sway" (diff)
downloadsway-eda57e7761485f08c1bde0ef3e6a619d1b48348e.tar.gz
sway-eda57e7761485f08c1bde0ef3e6a619d1b48348e.tar.zst
sway-eda57e7761485f08c1bde0ef3e6a619d1b48348e.zip
Merge pull request #1927 from atomnuker/revert-libexec
Revert PR #1881
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build9
1 files changed, 0 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index e40dc33c..bf266e5f 100644
--- a/meson.build
+++ b/meson.build
@@ -19,14 +19,6 @@ is_freebsd = host_machine.system().startswith('freebsd')
19datadir = get_option('datadir') 19datadir = get_option('datadir')
20sysconfdir = get_option('sysconfdir') 20sysconfdir = get_option('sysconfdir')
21prefix = get_option('prefix') 21prefix = get_option('prefix')
22libexecdir = get_option('libexecdir')
23
24if libexecdir == ''
25 libexecdir = 'lib'
26endif
27sway_libexecdir = join_paths(prefix, libexecdir, 'sway')
28add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c')
29
30 22
31jsonc = dependency('json-c', version: '>=0.13') 23jsonc = dependency('json-c', version: '>=0.13')
32pcre = dependency('libpcre') 24pcre = dependency('libpcre')
@@ -121,7 +113,6 @@ config = configuration_data()
121config.set('sysconfdir', join_paths(prefix, sysconfdir)) 113config.set('sysconfdir', join_paths(prefix, sysconfdir))
122config.set('datadir', join_paths(prefix, datadir)) 114config.set('datadir', join_paths(prefix, datadir))
123config.set('prefix', prefix) 115config.set('prefix', prefix)
124config.set('sway_libexecdir', sway_libexecdir)
125 116
126configure_file( 117configure_file(
127 configuration: config, 118 configuration: config,