diff options
-rw-r--r-- | meson.build | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meson.build b/meson.build index f63f0e11..6efff3ed 100644 --- a/meson.build +++ b/meson.build | |||
@@ -204,7 +204,7 @@ configure_file( | |||
204 | configuration: config, | 204 | configuration: config, |
205 | input: 'config.in', | 205 | input: 'config.in', |
206 | output: '@BASENAME@', | 206 | output: '@BASENAME@', |
207 | install_dir: sysconfdir + '/sway' | 207 | install_dir: join_paths(sysconfdir, 'sway') |
208 | ) | 208 | ) |
209 | 209 | ||
210 | if is_freebsd | 210 | if is_freebsd |
@@ -212,20 +212,20 @@ if is_freebsd | |||
212 | configuration: config, | 212 | configuration: config, |
213 | input: 'security.d/10-freebsd.in', | 213 | input: 'security.d/10-freebsd.in', |
214 | output: '@BASENAME@', | 214 | output: '@BASENAME@', |
215 | install_dir: sysconfdir + '/sway/security.d' | 215 | install_dir: join_paths(sysconfdir, 'sway', 'security.d') |
216 | ) | 216 | ) |
217 | else | 217 | else |
218 | configure_file( | 218 | configure_file( |
219 | configuration: config, | 219 | configuration: config, |
220 | input: 'security.d/00-defaults.in', | 220 | input: 'security.d/00-defaults.in', |
221 | output: '@BASENAME@', | 221 | output: '@BASENAME@', |
222 | install_dir: sysconfdir + '/sway/security.d' | 222 | install_dir: join_paths(sysconfdir, 'sway', 'security.d') |
223 | ) | 223 | ) |
224 | endif | 224 | endif |
225 | 225 | ||
226 | install_data( | 226 | install_data( |
227 | 'sway.desktop', | 227 | 'sway.desktop', |
228 | install_dir: datadir + '/wayland-sessions' | 228 | install_dir: join_paths(datadir, 'wayland-sessions') |
229 | ) | 229 | ) |
230 | 230 | ||
231 | if get_option('default-wallpaper') | 231 | if get_option('default-wallpaper') |
@@ -239,7 +239,7 @@ if get_option('default-wallpaper') | |||
239 | 'assets/Sway_Wallpaper_Blue_2048x1536.png', | 239 | 'assets/Sway_Wallpaper_Blue_2048x1536.png', |
240 | 'assets/Sway_Wallpaper_Blue_2048x1536_Portrait.png', | 240 | 'assets/Sway_Wallpaper_Blue_2048x1536_Portrait.png', |
241 | ) | 241 | ) |
242 | wallpaper_install_dir = datadir + '/backgrounds/sway' | 242 | wallpaper_install_dir = join_paths(datadir, 'backgrounds', 'sway') |
243 | 243 | ||
244 | install_data(wallpaper_files, install_dir: wallpaper_install_dir) | 244 | install_data(wallpaper_files, install_dir: wallpaper_install_dir) |
245 | endif | 245 | endif |
@@ -249,7 +249,7 @@ if get_option('zsh-completions') | |||
249 | 'completions/zsh/_sway', | 249 | 'completions/zsh/_sway', |
250 | 'completions/zsh/_swaymsg', | 250 | 'completions/zsh/_swaymsg', |
251 | ) | 251 | ) |
252 | zsh_install_dir = datadir + '/zsh/site-functions' | 252 | zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions') |
253 | 253 | ||
254 | install_data(zsh_files, install_dir: zsh_install_dir) | 254 | install_data(zsh_files, install_dir: zsh_install_dir) |
255 | endif | 255 | endif |
@@ -260,7 +260,7 @@ if get_option('bash-completions') | |||
260 | 'completions/bash/swaybar', | 260 | 'completions/bash/swaybar', |
261 | 'completions/bash/swaymsg', | 261 | 'completions/bash/swaymsg', |
262 | ) | 262 | ) |
263 | bash_install_dir = datadir + '/bash-completion/completions' | 263 | bash_install_dir = join_paths(datadir, 'bash-completion', 'completions') |
264 | 264 | ||
265 | install_data(bash_files, install_dir: bash_install_dir) | 265 | install_data(bash_files, install_dir: bash_install_dir) |
266 | endif | 266 | endif |
@@ -271,7 +271,7 @@ if get_option('fish-completions') | |||
271 | 'completions/fish/swaymsg.fish', | 271 | 'completions/fish/swaymsg.fish', |
272 | 'completions/fish/swaynag.fish', | 272 | 'completions/fish/swaynag.fish', |
273 | ) | 273 | ) |
274 | fish_install_dir = datadir + '/fish/completions' | 274 | fish_install_dir = join_paths(datadir, 'fish', 'completions') |
275 | 275 | ||
276 | install_data(fish_files, install_dir: fish_install_dir) | 276 | install_data(fish_files, install_dir: fish_install_dir) |
277 | endif | 277 | endif |