build: Fix module name to be module.so

Change-Id: I2022c92307535980d9cfbaf1baf1fa235edaf705

diff --git a/meson.build b/meson.build
index 84d792bbd4f3d22f9fcae5460154d252baf31b65..ee838ecd44f60580142d15e07fe75e3dd48c8f7d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -78,6 +78,8 @@ subdir('data')
 subdir('tests')
 subdir('isu')
 
+meson.add_install_script('meson/meson_modules.sh', module_files)
+
 configure_file(output: 'config.h', install: false, configuration: config_h)
 
 requirements_e = ' '.join([

diff --git a/meson/meson_modules.sh b/meson/meson_modules.sh
new file mode 100755 (executable)
index 0000000..c6f2318
--- /dev/null
+++ b/meson/meson_modules.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+for x in "$@" ; do
+       dir="$(dirname $x)"
+       mv "$DESTDIR"/"$x" "$DESTDIR"/"$dir"/module.so
+done

diff --git a/src/modules/meson.build b/src/modules/meson.build
index 210e819679ad8671ac26f94d4376288b7e99c3a6..06027a7fe7d3db345d851532a599e1f01ca42597 100644 (file)
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -11,9 +11,12 @@ foreach m: mods
   _dir         = join_paths(dir_module_e, m)
   _dir_bin     = join_paths(_dir, module_arch)
 
+  module_files += join_paths(_dir_bin, m + '.so')
+
   subdir(m)
   shared_module(m, src,
     include_directories: module_includes,
+    name_prefix        : '',
     dependencies       : [ module_deps ],
     install_dir        : _dir_bin,
     install            : true,