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>
---
 docs/internals/meson.build | 2 +-
 docs/kbase/meson.build     | 2 +-
 docs/manpages/meson.build  | 2 +-
 src/security/meson.build   | 2 +-
 src/storage/meson.build    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/internals/meson.build b/docs/internals/meson.build
index 5aa67ded5c..2d0ae6195c 100644
--- 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 8d8fd695ea..73dc11837f 100644
--- 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 fe91a43614..cafe29a545 100644
--- 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 6f5e1dec1d..6230b34aa4 100644
--- 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 915ae46f61..d1aa66b147 100644
--- 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,
   }
-- 
2.31.1

On Tue, Aug 10, 2021 at 05:54:28PM +0200, Andrea Bolognani wrote:
> 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>
> ---
>  docs/internals/meson.build | 2 +-
>  docs/kbase/meson.build     | 2 +-
>  docs/manpages/meson.build  | 2 +-
>  src/security/meson.build   | 2 +-
>  src/storage/meson.build    | 4 ++--
>  5 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|