meson: Prefer to use join_paths() over '/'

... to avoid mixing '/' and '\' in a path string on Windows.

diff --git a/meson.build b/meson.build
index bd9dac7..12f6dbe 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -27,7 +27,7 @@ curversion = gst_version_minor * 100 + gst_version_micro
 libversion = '@0@.@1@.0'.format(soversion, curversion)
 osxversion = curversion + 1
 
-plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
+plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
 
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')

diff --git a/tests/check/meson.build b/tests/check/meson.build
index 4816ef3..b3b4ebf 100644 (file)
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -138,7 +138,7 @@ foreach t : base_tests
     env.set('CK_DEFAULT_TIMEOUT', '20')
     env.set('GST_STATE_IGNORE_ELEMENTS', '')
     env.set('GST_PLUGIN_PATH_1_0', [meson.build_root()] + pluginsdirs)
-    env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name))
+    env.set('GST_REGISTRY', join_paths(meson.current_build_dir(), '@0@.registry'.format(test_name)))
     env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer', 'gst-plugins-base',
       'gst-plugins-good', 'gst-plugins-ugly','gst-libav',
       'gst-plugins-bad@' + meson.build_root())