diff --git a/src/inputsynth.c b/src/inputsynth.c index ddd7df2c22301a7498376cc288eab6894e4dd8ec..37a6794d7bdbc4d292bfbbf29b086cfbc06c5ff5 100644 --- a/src/inputsynth.c +++ b/src/inputsynth.c @@ -47,24 +47,22 @@ _load_library (InputsynthBackend backend) { case InputsynthBackend_XDO: func_name = "input_synth_xdo_new"; - g_string_append (module_name, "xdo-"); + g_string_append (module_name, "xdo"); break; case InputsynthBackend_XI2: func_name = "input_synth_xi2_new"; - g_string_append (module_name, "xi2-"); + g_string_append (module_name, "xi2"); break; case InputsynthBackend_WAYLAND_CLUTTER: func_name = "input_synth_wayland_clutter_new"; - g_string_append (module_name, "wayland_clutter-"); + g_string_append (module_name, "wayland_clutter"); break; default: g_printerr ("ERROR: BACKEND not supported!\n"); return NULL; } - g_string_append (module_name, API_VERSION); - - /* g_print ("Load module %s from path %s\n", module_name->str, plugin_dir); */ + g_print ("Load module %s from path %s\n", module_name->str, plugin_dir); GModule *module; gchar *module_path = NULL; diff --git a/src/meson.build b/src/meson.build index be8f3edb97a596a0be08ecf0240dc5dbbbe2dc26..0cb53578e04519967d9b17a5538028eb5f254068 100644 --- a/src/meson.build +++ b/src/meson.build @@ -43,7 +43,7 @@ install_headers(inputsynth_headers, subdir: api_path) args = [ '-DPLUGIN_DIR="@0@"'.format(join_paths(get_option('prefix'), get_option('libdir'), - 'libinputsynth/plugins')), + 'libinputsynth-' + api_version + '/plugins')), '-DAPI_VERSION="' + api_version +'"' ] @@ -81,11 +81,11 @@ if xdo_lib.found() xdo_lib ] - inputsynth_lib_xdo = shared_module('inputsynth_xdo-' + api_version, + inputsynth_lib_xdo = shared_module('inputsynth_xdo', inputsynth_sources_xdo, dependencies: [ inputsynth_deps, inputsynth_xdo_deps ], link_with: inputsynth_lib, - install_dir: join_paths(get_option('libdir'), 'libinputsynth/plugins'), + install_dir: join_paths(get_option('libdir'), 'libinputsynth-' + api_version + '/plugins'), install: true, ) @@ -116,11 +116,11 @@ if x11_dep.found() and xtst_dep.found() and xi_dep.found() xi_dep ] - inputsynth_lib_xi2 = shared_module('inputsynth_xi2-' + api_version, + inputsynth_lib_xi2 = shared_module('inputsynth_xi2', inputsynth_sources_xi2, dependencies: [ inputsynth_deps, inputsynth_xi2_deps ], link_with: inputsynth_lib, - install_dir: join_paths(get_option('libdir'), 'libinputsynth/plugins'), + install_dir: join_paths(get_option('libdir'), 'libinputsynth-' + api_version + '/plugins'), install: true, ) @@ -149,11 +149,11 @@ if mutter_clutter_dep.found() mutter_clutter_dep ] - inputsynth_lib_wayland_clutter = shared_module('inputsynth_wayland_clutter-' + api_version, + inputsynth_lib_wayland_clutter = shared_module('inputsynth_wayland_clutter', inputsynth_sources_wayland_clutter, dependencies: [ inputsynth_deps, inputsynth_wayland_clutter_deps ], link_with: inputsynth_lib, - install_dir: join_paths(get_option('libdir'), 'libinputsynth/plugins'), + install_dir: join_paths(get_option('libdir'), 'libinputsynth-' + api_version + '/plugins'), install: true, )