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/meson.build | |
| 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/meson.build')
| -rw-r--r-- | libnm/meson.build | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libnm/meson.build b/libnm/meson.build index 23971e8c76..80158c2fa2 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -168,8 +168,7 @@ libnm = shared_library( link_whole: libnm_core, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_dep = declare_dependency( @@ -188,8 +187,7 @@ pkg.generate( variables: [ 'exec_prefix=${prefix}', 'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN') - ], - install_dir: join_paths(nm_libdir, 'pkgconfig') + ] ) run_target( @@ -201,9 +199,6 @@ run_target( if enable_introspection gir_sources = libnm_core_enum + libnm_core_headers + libnm_core_sources + libnm_enum + libnm_headers + libnm_sources + [version_header] - gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version) - typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version) - libnm_gir = gnome.generate_gir( libnm, sources: gir_sources, @@ -214,9 +209,7 @@ if enable_introspection export_packages: 'libnm', includes: 'Gio-2.0', extra_args: cflags, - install: true, - install_dir_gir: gir_dir, - install_dir_typelib: typelib_dir + install: true ) generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl') |