diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2022-09-27 14:08:28 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2022-09-28 12:16:15 +0100 |
| commit | ba7d32270a83b16d8b2d696287f9b0ea5ca4fcc3 (patch) | |
| tree | b0d355bf69324f1f0ede519c94a32694a6665a38 | |
| parent | 2b6681d1bed456ca9c241dd9901dbc3652e6c9a7 (diff) | |
| download | grilo-ba7d32270a83b16d8b2d696287f9b0ea5ca4fcc3.tar.gz | |
build: Let Meson fill out the pkg-config directories
There's no need for us to define variables for prefixes, exec prefixes,
and datarootdirs.
Meson already fills out the prefix, bindir, libdir, and datadir
variables with appropriate values that can be expanded and overridden.
| -rw-r--r-- | libs/net/meson.build | 3 | ||||
| -rw-r--r-- | libs/pls/meson.build | 3 | ||||
| -rw-r--r-- | meson.build | 1 | ||||
| -rw-r--r-- | src/meson.build | 3 |
4 files changed, 0 insertions, 10 deletions
diff --git a/libs/net/meson.build b/libs/net/meson.build index c25f31e..a759c54 100644 --- a/libs/net/meson.build +++ b/libs/net/meson.build @@ -51,9 +51,6 @@ grlnet_pc = pkgconfig.generate(libgrlnet, description: 'Grilo networking helpers for plug-ins', version: grlnet_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, 'soupapiversion=' + soup_api_version, diff --git a/libs/pls/meson.build b/libs/pls/meson.build index 198d23c..2a9d729 100644 --- a/libs/pls/meson.build +++ b/libs/pls/meson.build @@ -42,9 +42,6 @@ grlpls_pc = pkgconfig.generate(libgrlpls, description: 'Grilo playlist utility', version: grlpls_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, ], diff --git a/meson.build b/meson.build index 7d84270..c03e8a1 100644 --- a/meson.build +++ b/meson.build @@ -88,7 +88,6 @@ plugins_dir_for_pc_file = join_paths('${libdir}', grl_name) localedir = join_paths(prefix, get_option('localedir')) datadir_unprefixed = get_option('datadir') datadir = join_paths(prefix, datadir_unprefixed) -datadir_for_pc_file = join_paths('${prefix}', datadir_unprefixed) girdir = join_paths(datadir, 'gir-1.0') girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0') diff --git a/src/meson.build b/src/meson.build index 10fd390..3ebab78 100644 --- a/src/meson.build +++ b/src/meson.build @@ -115,9 +115,6 @@ grl_pc = pkgconfig.generate(libgrl, description: 'Grilo Framework for multimedia developers', version: grilo_version, variables: [ - 'exec_prefix=${prefix}', - 'datarootdir=' + datadir_for_pc_file, - 'datadir=${datarootdir}', 'girdir=' + girdir_for_pc_file, 'typelibdir=' + typelibdir_for_pc_file, 'plugindir=' + plugins_dir_for_pc_file, |