From efa9bdccf972efeb377d38e2083e8d411c73b703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 10 Aug 2018 12:43:38 +0100 Subject: [PATCH] meson: fix install dir for generated header files Nixos installs into a non-standard includedir, so need to take account of the 'includedir' option instead of just hard-coding 'include' here. https://bugzilla.gnome.org/show_bug.cgi?id=794856 --- gst-libs/gst/app/meson.build | 2 +- gst-libs/gst/audio/meson.build | 2 +- gst-libs/gst/pbutils/meson.build | 4 ++-- gst-libs/gst/rtp/meson.build | 2 +- gst-libs/gst/rtsp/meson.build | 2 +- gst-libs/gst/tag/meson.build | 2 +- gst-libs/gst/video/meson.build | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build index 952e803eae..c6597ba9e0 100644 --- a/gst-libs/gst/app/meson.build +++ b/gst-libs/gst/app/meson.build @@ -12,7 +12,7 @@ app_enums = gnome.mkenums_simple('app-enumtypes', header_prefix : '#include ', decorator : 'GST_APP_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/app/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/app')) gstapp_c = app_enums[0] gstapp_h = app_enums[1] diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index bf8ce1d112..dea2757732 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -67,7 +67,7 @@ audio_enums = gnome.mkenums_simple('audio-enumtypes', header_prefix : '#include ', decorator : 'GST_AUDIO_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/audio/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/audio')) gstaudio_c = audio_enums[0] gstaudio_h = audio_enums[1] diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build index fa44c21f89..1bc537da0f 100644 --- a/gst-libs/gst/pbutils/meson.build +++ b/gst-libs/gst/pbutils/meson.build @@ -19,7 +19,7 @@ pbconf.set('PACKAGE_VERSION_MICRO', gst_version_micro) pbconf.set('PACKAGE_VERSION_NANO', gst_version_nano) gst_pbutils_version_h = configure_file(input : 'gstpluginsbaseversion.h.in', output: 'gstpluginsbaseversion.h', - install_dir : 'include/gstreamer-1.0/gst/pbutils/', + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/pbutils'), configuration: pbconf) pbutils_headers = [ @@ -43,7 +43,7 @@ pbutils_enums = gnome.mkenums_simple('pbutils-enumtypes', header_prefix : '#include ', decorator : 'GST_PBUTILS_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/pbutils/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/pbutils')) gstpbutils_c = pbutils_enums[0] gstpbutils_h = pbutils_enums[1] diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build index 4f95e59099..d6fabf45d6 100644 --- a/gst-libs/gst/rtp/meson.build +++ b/gst-libs/gst/rtp/meson.build @@ -27,7 +27,7 @@ rtp_enums = gnome.mkenums_simple('gstrtp-enumtypes', header_prefix : '#include ', decorator : 'GST_RTP_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/rtp/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/rtp')) gstrtp_enum_c = rtp_enums[0] gstrtp_enum_h = rtp_enums[1] diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build index f45fde7090..005cc9feaf 100644 --- a/gst-libs/gst/rtsp/meson.build +++ b/gst-libs/gst/rtsp/meson.build @@ -27,7 +27,7 @@ rtsp_enums = gnome.mkenums_simple('gstrtsp-enumtypes', header_prefix : '#include ', decorator : 'GST_RTSP_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/rtsp/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/rtsp')) gstrtsp_c = rtsp_enums[0] gstrtsp_h = rtsp_enums[1] diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build index cac2dd8a84..e7ef2aec6f 100644 --- a/gst-libs/gst/tag/meson.build +++ b/gst-libs/gst/tag/meson.build @@ -31,7 +31,7 @@ tag_enums = gnome.mkenums_simple('tag-enumtypes', header_prefix : '#include ', decorator : 'GST_TAG_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/tag/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/tag')) gsttag_c = tag_enums[0] gsttag_h = tag_enums[1] tag_gen_sources = [gsttag_h] diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build index 1af0973e2e..9225a2e0d3 100644 --- a/gst-libs/gst/video/meson.build +++ b/gst-libs/gst/video/meson.build @@ -92,7 +92,7 @@ video_enums = gnome.mkenums_simple('video-enumtypes', header_prefix : '#include ', decorator : 'GST_VIDEO_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/video/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/video')) gstvideo_c = video_enums[0] gstvideo_h = video_enums[1] video_gen_sources = [gstvideo_h]