diff --git a/meson.build b/meson.build index 85d58a35..8f522a3b 100644 --- a/meson.build +++ b/meson.build @@ -126,17 +126,6 @@ else endif add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') -if get_option('use_rpath') - if get_option('custom_rpath') == '' - # default to platform specific libdir, one level up from the binary - rpathdir = join_paths('$ORIGIN', '..', '$LIB') - else - rpathdir = get_option('custom_rpath') - endif -else - rpathdir = '' -endif - sway_inc = include_directories('include') subdir('include') diff --git a/meson_options.txt b/meson_options.txt index 836d171a..04b29e17 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,4 @@ option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') -option('use_rpath', type: 'boolean', value: false, description: 'install binaries with rpath set') -option('custom_rpath', type: 'string', value: '', description: 'override rpath with a custom one') 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('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') diff --git a/sway/meson.build b/sway/meson.build index 2388a66d..94d5abdb 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -205,6 +205,5 @@ executable( include_directories: [sway_inc], dependencies: sway_deps, link_with: [lib_sway_common], - install_rpath : rpathdir, install: true ) diff --git a/swaybar/meson.build b/swaybar/meson.build index a44c0061..b35f8169 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build @@ -42,6 +42,5 @@ executable( include_directories: [sway_inc], dependencies: swaybar_deps, link_with: [lib_sway_common, lib_sway_client], - install_rpath : rpathdir, install: true ) diff --git a/swaybg/meson.build b/swaybg/meson.build index 095c5488..8704de6d 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build @@ -14,6 +14,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install_rpath : rpathdir, install: true ) diff --git a/swaymsg/meson.build b/swaymsg/meson.build index 7318349d..b78e6cb0 100644 --- a/swaymsg/meson.build +++ b/swaymsg/meson.build @@ -1,9 +1,8 @@ executable( - 'swaymsg', - 'main.c', - include_directories: [sway_inc], - dependencies: [jsonc, wlroots], - link_with: [lib_sway_common], - install_rpath : rpathdir, - install: true + 'swaymsg', + 'main.c', + include_directories: [sway_inc], + dependencies: [jsonc, wlroots], + link_with: [lib_sway_common], + install: true ) diff --git a/swaynag/meson.build b/swaynag/meson.build index 223a0bc7..2ba3ed95 100644 --- a/swaynag/meson.build +++ b/swaynag/meson.build @@ -19,6 +19,5 @@ executable( wlroots, ], link_with: [lib_sway_common, lib_sway_client], - install_rpath : rpathdir, install: true )