gstpad: Probes that return HANDLED can reset the data info field

[platform/upstream/gstreamer.git] / pkgconfig / meson.build

diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
index 23aa5d0..9843772 100644 (file)
--- a/pkgconfig/meson.build
+++ b/pkgconfig/meson.build
@@ -1,6 +1,6 @@
 pkgconf = configuration_data()
 
-pkgconf.set('prefix', get_option('prefix'))
+pkgconf.set('prefix', join_paths(get_option('prefix')))
 pkgconf.set('exec_prefix', '${prefix}')
 pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
 pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
@@ -22,15 +22,16 @@ pkgconf.set('netlibdir', join_paths(meson.build_root(), gst_net.outdir()))
 
 pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
 
-pkg_files = ['gstreamer-base',
+pkg_files = [
+  'gstreamer-base',
   'gstreamer-controller',
   'gstreamer-net',
   'gstreamer'
 ]
 
-if host_machine.system() != 'windows'
-    pkgconf.set('checklibdir', join_paths(meson.build_root(), gst_check.outdir()))
-    pkg_files += ['gstreamer-check']
+if not get_option('check').disabled()
+  pkg_files += ['gstreamer-check']
+  pkgconf.set('checklibdir', join_paths(meson.build_root(), gst_check.outdir()))
 endif
 
 foreach p : pkg_files