Merge pull request #1598 from centricular/fix-module-instdir

Fix shared module installation directory on Windows

mesonbuild/backend/ninjabackend.py

@@ -643,6 +643,8 @@ int dummy;
                 # we want this specific output out of many outputs to not
                 # be installed.
                 custom_install_dir = True
+            elif isinstance(t, build.SharedModule):
+                outdirs[0] = self.environment.get_shared_module_dir()
             elif isinstance(t, build.SharedLibrary):
                 outdirs[0] = self.environment.get_shared_lib_dir()
             elif isinstance(t, build.StaticLibrary):

mesonbuild/environment.py

@@ -741,6 +741,10 @@ class Environment:
         "Install dir for the import library (library used for linking)"
         return self.get_libdir()
 
+    def get_shared_module_dir(self):
+        "Install dir for shared modules that are loaded at runtime"
+        return self.get_libdir()
+
     def get_shared_lib_dir(self):
         "Install dir for the shared library"
         if self.win_libdir_layout:

test cases/windows/7 mingw dll versioning/installed_files.txt

@@ -6,6 +6,6 @@ usr/bin/?libonlyversion-1.dll
 usr/lib/libonlyversion.dll.a
 usr/bin/?libonlysoversion-5.dll
 usr/lib/libonlysoversion.dll.a
-usr/libexec/libcustomdir.dll
+usr/libexec/?libcustomdir.dll
 usr/libexec/libcustomdir.dll.a
-usr/lib/libmodule.dll
+usr/lib/?libmodule.dll