diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2017-12-24 14:52:01 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-01-02 10:44:05 +0100 |
| commit | 03ba0f1b3af902341ad1ea3b25adafc274109e31 (patch) | |
| tree | 903de53ab20304df3d6fe7fd13ce56535a79b9cb /libnm-util | |
| parent | e965b7679dc1069178efca0dddd93223ab13555c (diff) | |
| download | NetworkManager-03ba0f1b3af902341ad1ea3b25adafc274109e31.tar.gz | |
build: Remove default install directories
The install directories of those targets that match the default
install directories have been removed because they are redundant.
This also allows a simple meson build files and it is unnecessary
to create some paths.
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00078.html
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/meson.build | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libnm-util/meson.build b/libnm-util/meson.build index eea36367d9..2d49def2b5 100644 --- a/libnm-util/meson.build +++ b/libnm-util/meson.build @@ -126,8 +126,7 @@ libnm_util = shared_library( c_args: cflags, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_util_dep = declare_dependency( @@ -143,8 +142,7 @@ pkg.generate( filebase: 'libnm-util', subdirs: nm_name, requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}', - install_dir: join_paths(nm_libdir, 'pkgconfig') + variables: 'exec_prefix=${prefix}' ) if enable_introspection @@ -155,9 +153,6 @@ if enable_introspection 'GObject-2.0' ] - gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version) - typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version) - libnm_util_gir = gnome.generate_gir( libnm_util, sources: gir_sources, @@ -167,9 +162,7 @@ if enable_introspection symbol_prefix: nm_id_prefix.to_lower(), export_packages: 'libnm-util', includes: gir_includes, - install: true, - install_dir_gir: gir_dir, - install_dir_typelib: typelib_dir + install: true ) libnm_util_gir_dep = declare_dependency( |