gstreamer: fix install dir for configure files

Nixos installs into a non-standard includedir.

https://bugzilla.gnome.org/show_bug.cgi?id=794856

diff --git a/gst/meson.build b/gst/meson.build
index fda4f7f..33a985a 100644 (file)
--- a/gst/meson.build
+++ b/gst/meson.build
@@ -182,7 +182,7 @@ gst_cdata.set('GST_DISABLE_PLUGIN_DEFINE', '#undef GST_DISABLE_PLUGIN')
 
 configure_file(input : 'gstconfig.h.in',
   output : 'gstconfig.h',
-  install_dir : 'include/gstreamer-1.0/gst',
+  install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst'),
   configuration : gst_cdata)
 
 version_cdata = configuration_data()
@@ -193,7 +193,7 @@ version_cdata.set('GST_VERSION_NANO', gst_version_nano)
 
 gst_version_h = configure_file(input : 'gstversion.h.in',
   output : 'gstversion.h',
-  install_dir : 'include/gstreamer-1.0/gst',
+  install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst'),
   configuration : version_cdata)
 
 gst_enums = gnome.mkenums_simple('gstenumtypes',

diff --git a/libs/gst/check/meson.build b/libs/gst/check/meson.build
index d6e8d21..13109f8 100644 (file)
--- a/libs/gst/check/meson.build
+++ b/libs/gst/check/meson.build
@@ -34,7 +34,7 @@ subdir('libcheck')
 configure_file(input : 'libcheck/check.h.in',
   output : 'internal-check.h',
   install : true,
-  install_dir : 'include/gstreamer-1.0/gst/check/',
+  install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/check'),
   configuration : check_cdata)
 
 gst_check = shared_library('gstcheck-@0@'.format(apiversion),

diff --git a/libs/gst/controller/meson.build b/libs/gst/controller/meson.build
index 4c0c924..6ef2769 100644 (file)
--- a/libs/gst/controller/meson.build
+++ b/libs/gst/controller/meson.build
@@ -31,7 +31,7 @@ controller_enums = gnome.mkenums_simple('controller-enumtypes',
   header_prefix : '#include <gst/controller/controller-prelude.h>',
   decorator : 'GST_CONTROLLER_API',
   install_header : true,
-  install_dir : 'include/gstreamer-1.0/gst/controller/')
+  install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/controller'))
 gstcontroller_c = controller_enums[0]
 gstcontroller_h = controller_enums[1]