Fix makefile

CMakeLists.txt

@@ -848,12 +848,11 @@ endif()
 
 
 # Set the Fortran module output directory for all targets
-set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
-#set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/include")
+#set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/modules)
 
 
-
-message(STATUS "fortran module direcotry ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}")
+set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MODULDIR}")
+message(STATUS "fortran module directory ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MODULDIR}")
 
 
 include_directories(${MPI_Fortran_INCLUDE_PATH})
@@ -1274,7 +1273,7 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/include/
 
 # Install module files
 install(DIRECTORY ${CMAKE_BINARY_DIR}/modules/
-  DESTINATION "${CMAKE_INSTALL_MODULDIR}"  # This will place .mod files in <prefix>/modules
+  DESTINATION "${CMAKE_Fortran_MODULE_DIRECTORY}"  # This will place .mod files in <prefix>/modules
   FILES_MATCHING PATTERN "*.mod"
 )
 

base/modules/Makefile

@@ -305,7 +305,7 @@ serial/psb_d_vect_mod.o: serial/psb_d_base_vect_mod.o serial/psb_i_vect_mod.o
 serial/psb_c_vect_mod.o: serial/psb_c_base_vect_mod.o serial/psb_i_vect_mod.o
 serial/psb_z_vect_mod.o: serial/psb_z_base_vect_mod.o serial/psb_i_vect_mod.o
 serial/psb_s_serial_mod.o serial/psb_d_serial_mod.o serial/psb_c_serial_mod.o serial/psb_z_serial_mod.o: serial/psb_mat_mod.o auxil/psb_string_mod.o auxil/psb_sort_mod.o auxil/psi_serial_mod.o
-serial/psb_vect_mod.o: serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o
+serial/psb_vect_mod.o: serial/psb_i2_vect_mod.o  serial/psb_i_vect_mod.o serial/psb_l_vect_mod.o serial/psb_d_vect_mod.o serial/psb_s_vect_mod.o serial/psb_c_vect_mod.o serial/psb_z_vect_mod.o
 
 auxil/psb_s_rb_idx_tree_mod.o: serial/psb_s_csr_mat_mod.o psb_realloc_mod.o
 auxil/psb_d_rb_idx_tree_mod.o: serial/psb_d_csr_mat_mod.o psb_realloc_mod.o