Make the LIBDIR path configurable

This commit is contained in:
Nicolas Braud-Santoni 2018-05-01 16:49:15 +02:00
parent 7709340727
commit 1670b46bf6
5 changed files with 12 additions and 4 deletions

View file

@ -19,6 +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')
if instlibdir == ''
instlibdir = join_paths(prefix, 'lib/sway')
endif
add_project_arguments('-DINSTLIBDIR="/@0@"'.format(instlibdir), language : 'c')
jsonc = dependency('json-c', version: '>=0.13') jsonc = dependency('json-c', version: '>=0.13')
pcre = dependency('libpcre') pcre = dependency('libpcre')

View file

@ -1,3 +1,4 @@
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.')

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 = ":/usr/lib/sway"; const char *extra_path = ":" INSTLIBDIR;
const size_t extra_size = sizeof("/usr/lib/sway") + 1; const size_t extra_size = sizeof(INSTLIBDIR) + 1;
if (!path) { if (!path) {
size_t n = confstr(_CS_PATH, NULL, 0); size_t n = confstr(_CS_PATH, NULL, 0);

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: 'usr/lib/sway' install_dir: instlibdir
) )

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: 'usr/lib/sway' install_dir: instlibdir
) )