From 2d632ff36790e8dc3dec2271852cefb532d46f59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 8 Aug 2017 00:13:01 +0100 Subject: [PATCH] meson: fix a few meson warnings --- docs/meson.build | 2 +- pkgconfig/meson.build | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/meson.build b/docs/meson.build index a44c239fd6..8c72872bfc 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,7 +1,7 @@ docconf = configuration_data() docconf.set('GST_API_VERSION', api_version) -docconf.set('PACKAGE_VERSION', gst_version) +docconf.set('VERSION', gst_version) docconf.set('PLUGINDIR', '@0@/lib/gstreamer-1.0'.format(get_option('prefix'))) version_entities = configure_file(input : 'version.entities.in', diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build index ebc23f7119..e878ad8d5e 100644 --- a/pkgconfig/meson.build +++ b/pkgconfig/meson.build @@ -6,6 +6,7 @@ pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) pkgconf.set('GST_API_VERSION', api_version) pkgconf.set('VERSION', gst_version) +pkgconf.set('LIBM', libm.found() ? '-lm' : '') # needed for generating -uninstalled.pc files pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..'))