alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Meson: Replace option instlibdir with libexecdir

Browse source 
Derive a value from it, called `rundir` rather than writing join_paths(libexecdir,
'sway') all over the place.
This commit is contained in:
Nicolas Braud-Santoni 2018-05-01 20:47:55 +02:00
parent 1670b46bf6
commit 830c4ef74c
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -19,12 +19,13 @@ is_freebsd = host_machine.system().startswith('freebsd')
datadir = get_option('datadir') datadir = get_option('datadir')
sysconfdir = get_option('sysconfdir') sysconfdir = get_option('sysconfdir')
prefix = get_option('prefix') prefix = get_option('prefix')
instlibdir = get_option('instlibdir') libexecdir = get_option('libexecdir')
if instlibdir == '' if libexecdir == ''
instlibdir = join_paths(prefix, 'lib/sway') libexecdir = 'lib'
endif endif
add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c') sway_libexecdir = join_paths(prefix, libexecdir, 'sway')
add_project_arguments('-DSWAY_LIBEXECDIR="/@0@"'.format(sway_libexecdir), language : 'c')
jsonc = dependency('json-c', version: '>=0.13') jsonc = dependency('json-c', version: '>=0.13')

1
meson_options.txt
View file

@ -1,4 +1,3 @@
option('instlibdir', type: 'string', description: 'Installation path for sway-internal executables, such as swaybg or swaybar. (Default: prefix/lib/sway)')
option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.') option('sway_version', type : 'string', description: 'The version string reported in `sway --version`.')
option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')

4
sway/commands/exec_always.c
View file

@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((*child = fork()) == 0) { if ((*child = fork()) == 0) {
// Acquire the current PATH // Acquire the current PATH
char *path = getenv("PATH"); char *path = getenv("PATH");
const char *extra_path = ":" INSTLIBDIR; const char *extra_path = ":" SWAY_LIBEXECDIR;
const size_t extra_size = sizeof(INSTLIBDIR) + 1; const size_t extra_size = sizeof(SWAY_LIBEXECDIR) + 1;
if (!path) { if (!path) {
size_t n = confstr(_CS_PATH, NULL, 0); size_t n = confstr(_CS_PATH, NULL, 0);

2
swaybar/meson.build
View file

@ -25,5 +25,5 @@ executable(
], ],
link_with: [lib_sway_common, lib_sway_client], link_with: [lib_sway_common, lib_sway_client],
install: true, install: true,
install_dir: instlibdir install_dir: sway_libexecdir
) )

2
swaybg/meson.build
View file

@ -15,5 +15,5 @@ executable(
], ],
link_with: [lib_sway_common, lib_sway_client], link_with: [lib_sway_common, lib_sway_client],
install: true, install: true,
install_dir: instlibdir install_dir: sway_libexecdir
) )