[libgweather] build: Fix the pkg-config file generation
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather] build: Fix the pkg-config file generation
- Date: Mon, 27 Nov 2017 13:50:20 +0000 (UTC)
commit f59b33978afc2db191008408aed65ab6ee0e814e
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Nov 27 13:39:43 2017 +0000
build: Fix the pkg-config file generation
The call to generate the pkg-config file is missing the location of the
headers, since libgweather uses a subdirectory of the includedir.
This commit fixes the build of projects depending on libgweather on
Continuous.
data/meson.build | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 60d3d29..c7881b4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,19 +1,22 @@
-# FIXME check syntax of Locations.xml
-
pkgconfig.generate(
- filebase : 'gweather-3.0',
- name : 'GWeather',
- description : 'GWeather shared library',
- version : meson.project_version(),
- libraries : lib_libgweather,
+ filebase: 'gweather-3.0',
+ name: 'GWeather',
+ description: 'GWeather shared library',
+ version: meson.project_version(),
+ libraries: lib_libgweather,
+ subdirs: 'libgweather-3.0',
)
if enable_glade_catalog
install_data('glade/libgweather.xml',
- install_dir: glade_catalogdir)
+ install_dir: glade_catalogdir,
+ )
endif
+# FIXME check syntax of Locations.xml
install_data('Locations.xml',
- install_dir: pkgdatadir)
+ install_dir: pkgdatadir,
+)
install_data('locations.dtd',
- install_dir: pkgdatadir)
+ install_dir: pkgdatadir,
+)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]