installer: use moduledir for modules

Author: perazz

src/fpm/cmd/install.f90

@@ -63,7 +63,7 @@ subroutine cmd_install(settings)
 
     call new_installer(installer, prefix=settings%prefix, &
       bindir=settings%bindir, libdir=settings%libdir, testdir=settings%testdir, &
-      includedir=settings%includedir, &
+      includedir=settings%includedir, moduledir=package%install%module_dir, &
       verbosity=merge(2, 1, settings%verbose))
 
     if (allocated(package%library) .and. package%install%library) then
@@ -141,7 +141,7 @@ subroutine install_module_files(installer, targets, error)
     call filter_modules(targets, modules)
 
     do ii = 1, size(modules)
-      call installer%install_header(modules(ii)%s//".mod", error)
+      call installer%install_module(modules(ii)%s//".mod", error)
       if (allocated(error)) exit
     end do
     if (allocated(error)) return

src/fpm/installer.f90

@@ -27,6 +27,8 @@ module fpm_installer
     character(len=:), allocatable :: testdir
     !> Include directory relative to the installation prefix
     character(len=:), allocatable :: includedir
+    !> Module directory relative to the installation prefix
+    character(len=:), allocatable :: moduledir
     !> Output unit for informative printout
     integer :: unit = output_unit
     !> Verbosity of the installer
@@ -46,6 +48,8 @@ module fpm_installer
     procedure :: install_library
     !> Install a header/module in its correct subdirectory
     procedure :: install_header
+    !> Install a module in its correct subdirectory
+    procedure :: install_module
     !> Install a test program in its correct subdirectory
     procedure :: install_test
     !> Install a generic file into a subdirectory in the installation prefix
@@ -69,6 +73,9 @@ module fpm_installer
   !> Default name of the include subdirectory
   character(len=*), parameter :: default_includedir = "include"
 
+  !> Default name of the module subdirectory
+  character(len=*), parameter :: default_moduledir = "include"
+
   !> Copy command on Unix platforms
   character(len=*), parameter :: default_copy_unix = "cp"
 
@@ -90,7 +97,7 @@ module fpm_installer
 contains
 
   !> Create a new instance of an installer
-  subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verbosity, &
+  subroutine new_installer(self, prefix, bindir, libdir, includedir, moduledir, testdir, verbosity, &
           copy, move)
     !> Instance of the installer
     type(installer_t), intent(out) :: self
@@ -102,6 +109,8 @@ subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verb
     character(len=*), intent(in), optional :: libdir
     !> Include directory relative to the installation prefix
     character(len=*), intent(in), optional :: includedir
+    !> Module directory relative to the installation prefix
+    character(len=*), intent(in), optional :: moduledir
     !> Test directory relative to the installation prefix
     character(len=*), intent(in), optional :: testdir    
     !> Verbosity of the installer
@@ -139,6 +148,12 @@ subroutine new_installer(self, prefix, bindir, libdir, includedir, testdir, verb
     else
       self%includedir = default_includedir
     end if
+
+    if (present(moduledir)) then
+      self%moduledir = moduledir
+    else
+      self%moduledir = default_moduledir
+    end if
 
     if (present(testdir)) then 
       self%testdir = testdir
@@ -288,6 +303,18 @@ subroutine install_header(self, header, error)
     call self%install(header, self%includedir, error)
   end subroutine install_header
 
+  !> Install a module in its correct subdirectory
+  subroutine install_module(self, module, error)
+    !> Instance of the installer
+    class(installer_t), intent(inout) :: self
+    !> Path to the module
+    character(len=*), intent(in) :: module
+    !> Error handling
+    type(error_t), allocatable, intent(out) :: error
+
+    call self%install(module, self%moduledir, error)
+  end subroutine install_module
+
   !> Install a generic file into a subdirectory in the installation prefix
   subroutine install(self, source, destination, error)
     !> Instance of the installer

test/fpm_test/test_installer.f90

@@ -36,6 +36,7 @@ subroutine collect_installer(testsuite)
             & new_unittest("install-pkgconfig", test_install_pkgconfig), &
             & new_unittest("install-sitepackages", test_install_sitepackages), &
             & new_unittest("install-mod", test_install_mod), &
+            & new_unittest("install-module-custom", test_install_module_custom), &
             & new_unittest("install-exe-unix", test_install_exe_unix), &
             & new_unittest("install-exe-win", test_install_exe_win), &
             & new_unittest("install-test-unix", test_install_tests_unix), &
@@ -184,6 +185,22 @@ subroutine test_install_mod(error)
 
     end subroutine test_install_mod
 
+    subroutine test_install_module_custom(error)
+        !> Error handling
+        type(error_t), allocatable, intent(out) :: error
+
+        type(mock_installer_t) :: mock
+        type(installer_t) :: installer
+
+        call new_installer(installer, prefix="PREFIX", moduledir="custom/modules", verbosity=0, copy="mock")
+        mock%installer_t = installer
+        mock%expected_dir = join_path("PREFIX", "custom/modules")
+        mock%expected_run = 'mock "test_module.mod" "'//join_path("PREFIX", "custom/modules")//'"'
+
+        call mock%install_module("test_module.mod", error)
+
+    end subroutine test_install_module_custom
+
     subroutine test_install_shared_library_unix(error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error