From c73abb0c71b6ea4fb268f9d99fda63fd6aac8eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 10 Aug 2018 12:57:47 +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/interfaces/meson.build | 3 ++- gst-libs/gst/mpegts/meson.build | 2 +- gst-libs/gst/webrtc/meson.build | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/interfaces/meson.build b/gst-libs/gst/interfaces/meson.build index 0ff83fea94..31c18c8853 100644 --- a/gst-libs/gst/interfaces/meson.build +++ b/gst-libs/gst/interfaces/meson.build @@ -7,7 +7,8 @@ photo_enums = gnome.mkenums_simple('photography-enumtypes', header_prefix : '#include ', decorator: 'GST_PHOTOGRAPHY_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/interfaces/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/interfaces')) + photoenum_c = photo_enums[0] photoenum_h = photo_enums[1] diff --git a/gst-libs/gst/mpegts/meson.build b/gst-libs/gst/mpegts/meson.build index 0c244a9e97..9e2ed1ceaa 100644 --- a/gst-libs/gst/mpegts/meson.build +++ b/gst-libs/gst/mpegts/meson.build @@ -23,7 +23,7 @@ mpegts_enums = gnome.mkenums_simple('gstmpegts-enumtypes', header_prefix : '#include ', decorator : 'GST_MPEGTS_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/mpegts/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/mpegts')) mpegtsenumtypes_h = mpegts_enums[1] diff --git a/gst-libs/gst/webrtc/meson.build b/gst-libs/gst/webrtc/meson.build index bf0861c3a2..6e284b6831 100644 --- a/gst-libs/gst/webrtc/meson.build +++ b/gst-libs/gst/webrtc/meson.build @@ -30,7 +30,8 @@ webrtc_enums = gnome.mkenums_simple('webrtc-enumtypes', header_prefix : '#include ', decorator: 'GST_WEBRTC_API', install_header: true, - install_dir : 'include/gstreamer-1.0/gst/webrtc/') + install_dir : join_paths(get_option('includedir'), 'gstreamer-1.0/gst/webrtc/')) + gstwebrtc_c = webrtc_enums[0] gstwebrtc_h = webrtc_enums[1]