Skip to content

Commit

Permalink
Make the LIBDIR path configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
nbraud committed May 5, 2018
1 parent 7709340 commit 1670b46
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 4 deletions.
7 changes: 7 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ is_freebsd = host_machine.system().startswith('freebsd')
datadir = get_option('datadir')
sysconfdir = get_option('sysconfdir')
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')
pcre = dependency('libpcre')
Expand Down
1 change: 1 addition & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
@@ -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('default_wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.')
option('zsh_completions', type: 'boolean', value: true, description: 'Install zsh shell completions.')
4 changes: 2 additions & 2 deletions sway/commands/exec_always.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
if ((*child = fork()) == 0) {
// Acquire the current PATH
char *path = getenv("PATH");
const char *extra_path = ":/usr/lib/sway";
const size_t extra_size = sizeof("/usr/lib/sway") + 1;
const char *extra_path = ":" INSTLIBDIR;
const size_t extra_size = sizeof(INSTLIBDIR) + 1;

if (!path) {
size_t n = confstr(_CS_PATH, NULL, 0);
Expand Down
2 changes: 1 addition & 1 deletion swaybar/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
install_dir: 'usr/lib/sway'
install_dir: instlibdir
)
2 changes: 1 addition & 1 deletion swaybg/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ executable(
],
link_with: [lib_sway_common, lib_sway_client],
install: true,
install_dir: 'usr/lib/sway'
install_dir: instlibdir
)

0 comments on commit 1670b46

Please sign in to comment.