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>

diff --git a/docs/internals/meson.build b/docs/internals/meson.build
index 5aa67ded5c993fb6ca9ebdf278243e8a3f6ecd70..2d0ae6195c70234e8e1f36ff66296002992d0d0e 100644 (file)
--- a/docs/internals/meson.build
+++ b/docs/internals/meson.build
@@ -12,7 +12,7 @@ html_xslt_gen = []
 foreach name : internals_in_files
   html_xslt_gen += {
     'name': name,
-    'source': 'docs/internals' / name + '.html.in',
+    'source': 'docs' / 'internals' / name + '.html.in',
   }
 endforeach
 

diff --git a/docs/kbase/meson.build b/docs/kbase/meson.build
index 8d8fd695ea46364f75ad51ab324452cbae838372..73dc11837f9f653fdfd9a2f233f8155e22d1fe67 100644 (file)
--- a/docs/kbase/meson.build
+++ b/docs/kbase/meson.build
@@ -31,7 +31,7 @@ foreach name : docs_kbase_files
   html_xslt_gen += {
     'name': name,
     'file': docs_rst2html5_gen.process(rst_file),
-    'source': 'docs/kbase' / rst_file,
+    'source': 'docs' / 'kbase' / rst_file,
   }
 endforeach
 

diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
index fe91a4361464691ce351fbde9bc3d1e84a0847a9..cafe29a5450e3bd964d710a1dee6b11797f648cf 100644 (file)
--- a/docs/manpages/meson.build
+++ b/docs/manpages/meson.build
@@ -125,7 +125,7 @@ foreach data : docs_man_files
   html_xslt_gen += {
     'name': data['name'],
     'file': html_in,
-    'source': 'docs/manpages' / rst_in_file,
+    'source': 'docs' / 'manpages' / rst_in_file,
   }
 endforeach
 

diff --git a/src/security/meson.build b/src/security/meson.build
index 6f5e1dec1de79fef4325043448414f90d9492576..6230b34aa497093a85548d5df4a13b12438ed18d 100644 (file)
--- a/src/security/meson.build
+++ b/src/security/meson.build
@@ -47,7 +47,7 @@ if conf.has('WITH_LIBVIRTD') and conf.has('WITH_APPARMOR')
       conf_inc_dir,
       hypervisor_inc_dir,
       include_directories('.'),
-      include_directories('../storage_file'),
+      include_directories('..' / 'storage_file'),
     ],
   }
 endif

diff --git a/src/storage/meson.build b/src/storage/meson.build
index 915ae46f61702db91460c39cb76360771926fa95..d1aa66b1470171510f476ee96791467ee9c9fd03 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -79,7 +79,7 @@ if conf.has('WITH_STORAGE')
     ],
     include_directories: [
       conf_inc_dir,
-      include_directories('../storage_file'),
+      include_directories('..' / 'storage_file'),
     ],
   )
 
@@ -163,7 +163,7 @@ if conf.has('WITH_STORAGE_GLUSTER')
       glusterfs_dep,
     ],
     'include': [
-      include_directories('../storage_file'),
+      include_directories('..' / 'storage_file'),
     ],
     'install_dir': storage_backend_install_dir,
   }