RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: use `/` instead of `join_paths`

pull/2926/head
Aleksei Bavshin 2024-02-17 00:53:45 -08:00
parent c2f37705ad
commit d9f9fb51ff
No known key found for this signature in database
GPG Key ID: 4F071603387A382A
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -143,7 +143,7 @@ sysconfdir = get_option('sysconfdir')
conf_data = configuration_data() conf_data = configuration_data()
conf_data.set('prefix', prefix) conf_data.set('prefix', prefix)
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'cpp') add_project_arguments('-DSYSCONFDIR="@0@"'.format(prefix / sysconfdir), language : 'cpp')
if systemd.found() if systemd.found()
user_units_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir') user_units_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir')
@ -429,7 +429,7 @@ executable(
install_data( install_data(
'./resources/config', './resources/config',
'./resources/style.css', './resources/style.css',
install_dir: sysconfdir + '/xdg/waybar' install_dir: sysconfdir / 'xdg/waybar'
) )
scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages')) scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
@ -442,11 +442,11 @@ if scdoc.found()
input: 'man/waybar.5.scd.in', input: 'man/waybar.5.scd.in',
output: 'waybar.5.scd', output: 'waybar.5.scd',
configuration: { configuration: {
'sysconfdir': join_paths(prefix, sysconfdir) 'sysconfdir': prefix / sysconfdir
} }
) )
main_manpage_path = join_paths(meson.project_build_root(), '@0@'.format(main_manpage)) main_manpage_path = meson.project_build_root() / '@0@'.format(main_manpage)
mandir = get_option('mandir') mandir = get_option('mandir')
man_files = [ man_files = [
@ -508,7 +508,7 @@ if scdoc.found()
custom_target( custom_target(
output, output,
# drops the 'man' if `path` is an absolute path # drops the 'man' if `path` is an absolute path
input: join_paths('man', path), input: 'man' / path,
output: output, output: output,
command: [ command: [
sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output) sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)