From 87dfa8e670a080c3067d20f85b6af35cd8071a87 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 4 Apr 2025 20:13:29 +0200 Subject: Meson: Make plugindir relative to libdir --- libdino/meson.build | 2 +- meson_options.txt | 2 +- plugins/http-files/meson.build | 2 +- plugins/ice/meson.build | 2 +- plugins/notification-sound/meson.build | 2 +- plugins/omemo/meson.build | 2 +- plugins/openpgp/meson.build | 2 +- plugins/rtp/meson.build | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libdino/meson.build b/libdino/meson.build index 22e44372..11e25d6b 100644 --- a/libdino/meson.build +++ b/libdino/meson.build @@ -78,7 +78,7 @@ sources = files( sources += [version_vala] c_args = [ '-DDINO_SYSTEM_LIBDIR_NAME="@0@"'.format(get_option('prefix') / get_option('libdir')), - '-DDINO_SYSTEM_PLUGIN_DIR="@0@"'.format(get_option('prefix') / get_option('plugindir')), + '-DDINO_SYSTEM_PLUGIN_DIR="@0@"'.format(get_option('prefix') / get_option('libdir') / get_option('plugindir')), '-DG_LOG_DOMAIN="libdino"', ] vala_args = [] diff --git a/meson_options.txt b/meson_options.txt index a7ce0be1..bbfcfec5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('plugindir', type: 'string', value: 'lib/dino/plugins', description: 'Dino plugin directory') +option('plugindir', type: 'string', value: 'dino/plugins', description: 'Dino plugin directory, relative to libdir') option('plugin-http-files', type: 'feature', description: 'HTTP file upload') option('plugin-ice', type: 'feature', description: 'Peer-to-peer communication') diff --git a/plugins/http-files/meson.build b/plugins/http-files/meson.build index e0906369..1907e486 100644 --- a/plugins/http-files/meson.build +++ b/plugins/http-files/meson.build @@ -18,6 +18,6 @@ sources = files( vala_args = [ '-D', 'SOUP_3_0', ] -lib_http_files = shared_library('http-files', sources, name_prefix: '', vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_http_files = shared_library('http-files', sources, name_prefix: '', vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_http_files = declare_dependency(link_with: lib_http_files, include_directories: include_directories('.')) summary('HTTP file upload (http-files)', dep_http_files, section: 'Plugins') diff --git a/plugins/ice/meson.build b/plugins/ice/meson.build index 052f297c..10e70cd9 100644 --- a/plugins/ice/meson.build +++ b/plugins/ice/meson.build @@ -24,6 +24,6 @@ c_args = [ vala_args = [ '--vapidir', meson.current_source_dir() / 'vapi', ] -lib_ice = shared_library('ice', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_ice = shared_library('ice', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_ice = declare_dependency(link_with: lib_ice, include_directories: include_directories('.')) summary('Peer-to-peer communication (ice)', dep_ice, section: 'Plugins') diff --git a/plugins/notification-sound/meson.build b/plugins/notification-sound/meson.build index eacc0228..8d3c7694 100644 --- a/plugins/notification-sound/meson.build +++ b/plugins/notification-sound/meson.build @@ -15,6 +15,6 @@ sources = files( vala_args = [ '--vapidir', meson.current_source_dir() / 'vapi', ] -lib_notification_sound = shared_library('notification-sound', sources, name_prefix: '', vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_notification_sound = shared_library('notification-sound', sources, name_prefix: '', vala_args: vala_args, dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_notification_sound = declare_dependency(link_with: lib_notification_sound, include_directories: include_directories('.')) summary('Sound for chat notifications (notification-sound)', dep_notification_sound, section: 'Plugins') \ No newline at end of file diff --git a/plugins/omemo/meson.build b/plugins/omemo/meson.build index b25750f7..20fec73e 100644 --- a/plugins/omemo/meson.build +++ b/plugins/omemo/meson.build @@ -69,7 +69,7 @@ vala_args = [ '--internal-vapi', meson.current_build_dir() / 'omemo-internal.vapi', '--internal-header', meson.current_build_dir() / 'omemo-internal.h', ] -lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_omemo = shared_library('omemo', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_omemo = declare_dependency(link_with: lib_omemo, include_directories: include_directories('.')) summary('End-to-end encryption using OMEMO (omemo)', dep_omemo, section: 'Plugins') # This is to use the internal vapi instead of the regular diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build index 968c163d..6428771b 100644 --- a/plugins/openpgp/meson.build +++ b/plugins/openpgp/meson.build @@ -43,6 +43,6 @@ vala_args = [ if dep_libadwaita.version() == 'unknown' or dep_libadwaita.version().version_compare('>=1.4') vala_args += ['-D', 'Adw_1_4'] endif -lib_openpgp = shared_library('openpgp', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_openpgp = shared_library('openpgp', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_openpgp = declare_dependency(link_with: lib_openpgp, include_directories: include_directories('.')) summary('End-to-end encryption using PGP (openpgp)', dep_openpgp, section: 'Plugins') diff --git a/plugins/rtp/meson.build b/plugins/rtp/meson.build index c70a414b..54d45877 100644 --- a/plugins/rtp/meson.build +++ b/plugins/rtp/meson.build @@ -79,7 +79,7 @@ if get_option('plugin-rtp-vp9').allowed() vala_args += ['-D', 'ENABLE_VP9'] endif -lib_rtp = shared_library('rtp', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / 'dino/plugins') +lib_rtp = shared_library('rtp', sources, name_prefix: '', c_args: c_args, vala_args: vala_args, include_directories: include_directories('src'), dependencies: dependencies, install: true, install_dir: get_option('libdir') / get_option('plugindir')) dep_rtp = declare_dependency(link_with: lib_rtp, include_directories: include_directories('.')) summary('Voice/video calls (rtp)', dep_rtp, section: 'Plugins') -- cgit v1.3