diff options
| author | Bastian Köcher <gnome@kchr.de> | 2018-08-10 12:57:47 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-08-10 12:57:47 +0100 |
| commit | c73abb0c71b6ea4fb268f9d99fda63fd6aac8eef (patch) | |
| tree | 62cdc293f5e395cde8324503929f44ad94711e93 /gst-libs | |
| parent | 10fcddedc246375d28cb74a977cfa506ba5de464 (diff) | |
| download | gstreamer-plugins-bad-c73abb0c71b6ea4fb268f9d99fda63fd6aac8eef.tar.gz | |
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
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/interfaces/meson.build | 3 | ||||
| -rw-r--r-- | gst-libs/gst/mpegts/meson.build | 2 | ||||
| -rw-r--r-- | 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 0ff83fea9..31c18c885 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 <gst/interfaces/photography-prelude.h>', 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 0c244a9e9..9e2ed1cea 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 <gst/mpegts/mpegts-prelude.h>', 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 bf0861c3a..6e284b683 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 <gst/webrtc/webrtc_fwd.h>', 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] |