mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstreamer: fix install dir for configure files

Browse source 
Nixos installs into a non-standard includedir.

https://bugzilla.gnome.org/show_bug.cgi?id=794856
This commit is contained in:
Bastian Köcher 2018-04-01 16:06:26 +02:00 committed by Tim-Philipp Müller
parent 9722e89644
commit cd3e55c38e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/meson.build
View file

@ -182,7 +182,7 @@ gst_cdata.set('GST_DISABLE_PLUGIN_DEFINE', '#undef GST_DISABLE_PLUGIN')
configure_file(input : 'gstconfig.h.in', configure_file(input : 'gstconfig.h.in',
output : 'gstconfig.h', output : 'gstconfig.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst'),
configuration : gst_cdata) configuration : gst_cdata)
version_cdata = configuration_data() 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', gst_version_h = configure_file(input : 'gstversion.h.in',
output : 'gstversion.h', output : 'gstversion.h',
install_dir : 'include/gstreamer-1.0/gst', install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst'),
configuration : version_cdata) configuration : version_cdata)
gst_enums = gnome.mkenums_simple('gstenumtypes', gst_enums = gnome.mkenums_simple('gstenumtypes',

2
libs/gst/check/meson.build
View file

@ -34,7 +34,7 @@ subdir('libcheck')
configure_file(input : 'libcheck/check.h.in', configure_file(input : 'libcheck/check.h.in',
output : 'internal-check.h', output : 'internal-check.h',
install : true, 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) configuration : check_cdata)
gst_check = shared_library('gstcheck-@0@'.format(apiversion), gst_check = shared_library('gstcheck-@0@'.format(apiversion),

2
libs/gst/controller/meson.build
View file

@ -31,7 +31,7 @@ controller_enums = gnome.mkenums_simple('controller-enumtypes',
header_prefix : '#include <gst/controller/controller-prelude.h>', header_prefix : '#include <gst/controller/controller-prelude.h>',
decorator : 'GST_CONTROLLER_API', decorator : 'GST_CONTROLLER_API',
install_header : true, 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_c = controller_enums[0]
gstcontroller_h = controller_enums[1] gstcontroller_h = controller_enums[1]