mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-22 11:22:23 +00:00
meson: Always use the / operator to join paths
This is the preferred way to do it, but there were a few instances in which some of the path components had embedded slashes instead. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
556022c4dc
commit
2c0f47e75c
@ -12,7 +12,7 @@ html_xslt_gen = []
|
|||||||
foreach name : internals_in_files
|
foreach name : internals_in_files
|
||||||
html_xslt_gen += {
|
html_xslt_gen += {
|
||||||
'name': name,
|
'name': name,
|
||||||
'source': 'docs/internals' / name + '.html.in',
|
'source': 'docs' / 'internals' / name + '.html.in',
|
||||||
}
|
}
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ foreach name : docs_kbase_files
|
|||||||
html_xslt_gen += {
|
html_xslt_gen += {
|
||||||
'name': name,
|
'name': name,
|
||||||
'file': docs_rst2html5_gen.process(rst_file),
|
'file': docs_rst2html5_gen.process(rst_file),
|
||||||
'source': 'docs/kbase' / rst_file,
|
'source': 'docs' / 'kbase' / rst_file,
|
||||||
}
|
}
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ foreach data : docs_man_files
|
|||||||
html_xslt_gen += {
|
html_xslt_gen += {
|
||||||
'name': data['name'],
|
'name': data['name'],
|
||||||
'file': html_in,
|
'file': html_in,
|
||||||
'source': 'docs/manpages' / rst_in_file,
|
'source': 'docs' / 'manpages' / rst_in_file,
|
||||||
}
|
}
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR')
|
|||||||
conf_inc_dir,
|
conf_inc_dir,
|
||||||
hypervisor_inc_dir,
|
hypervisor_inc_dir,
|
||||||
include_directories('.'),
|
include_directories('.'),
|
||||||
include_directories('../storage_file'),
|
include_directories('..' / 'storage_file'),
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
endif
|
endif
|
||||||
|
@ -79,7 +79,7 @@ if conf.has('WITH_STORAGE')
|
|||||||
],
|
],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
conf_inc_dir,
|
conf_inc_dir,
|
||||||
include_directories('../storage_file'),
|
include_directories('..' / 'storage_file'),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ if conf.has('WITH_STORAGE_GLUSTER')
|
|||||||
glusterfs_dep,
|
glusterfs_dep,
|
||||||
],
|
],
|
||||||
'include': [
|
'include': [
|
||||||
include_directories('../storage_file'),
|
include_directories('..' / 'storage_file'),
|
||||||
],
|
],
|
||||||
'install_dir': storage_backend_install_dir,
|
'install_dir': storage_backend_install_dir,
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user