diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-05-05 19:37:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-05 19:37:13 -0400 |
commit | eda57e7761485f08c1bde0ef3e6a619d1b48348e (patch) | |
tree | fbe3642dfd9b4cf78240099decda61a7b52097ea /meson.build | |
parent | Merge pull request #1917 from RyanDwyer/pango-markup (diff) | |
parent | Revert "Install swaybar and swaybg under /usr/lib/sway" (diff) | |
download | sway-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.build | 9 |
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') | |||
19 | datadir = get_option('datadir') | 19 | datadir = get_option('datadir') |
20 | sysconfdir = get_option('sysconfdir') | 20 | sysconfdir = get_option('sysconfdir') |
21 | prefix = get_option('prefix') | 21 | prefix = get_option('prefix') |
22 | libexecdir = get_option('libexecdir') | ||
23 | |||
24 | if libexecdir == '' | ||
25 | libexecdir = 'lib' | ||
26 | endif | ||
27 | sway_libexecdir = join_paths(prefix, libexecdir, 'sway') | ||
28 | add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c') | ||
29 | |||
30 | 22 | ||
31 | jsonc = dependency('json-c', version: '>=0.13') | 23 | jsonc = dependency('json-c', version: '>=0.13') |
32 | pcre = dependency('libpcre') | 24 | pcre = dependency('libpcre') |
@@ -121,7 +113,6 @@ config = configuration_data() | |||
121 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) | 113 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) |
122 | config.set('datadir', join_paths(prefix, datadir)) | 114 | config.set('datadir', join_paths(prefix, datadir)) |
123 | config.set('prefix', prefix) | 115 | config.set('prefix', prefix) |
124 | config.set('sway_libexecdir', sway_libexecdir) | ||
125 | 116 | ||
126 | configure_file( | 117 | configure_file( |
127 | configuration: config, | 118 | configuration: config, |