diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9446d2f5..c82aa40a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,11 +9,6 @@ if(NOT DEFINED PSBLAS_INSTALL_DIR)
     message(FATAL_ERROR "Please specify the path to the psblas installation directory using -DPSBLAS_INSTALL_DIR=<path>")
 endif()
 message(STATUS "psblas directory is ${PSBLAS_INSTALL_DIR};;")
-# Set the include and library directories based on the provided path
-#set(TEST_INSTALLDIR "${PSBLAS_INSTALL_DIR}")
-set(INCDIR "${PSBLAS_INSTALL_DIR}/include")
-set(MODDIR "${PSBLAS_INSTALL_DIR}/modules")
-set(LIBDIR "${PSBLAS_INSTALL_DIR}/lib")
 
 
 message(STATUS "PSBLAS DIRECTORY INC ${INCDIR}; MOD ${MODDIR}; LIB ${LIBDIR};")
@@ -27,6 +22,14 @@ else()
     message(STATUS "Found PSBLAS: ${psblas_LIBRARIES}")
 endif()
 
+
+# Set the include and library directories based on the provided path
+#set(TEST_INSTALLDIR "${PSBLAS_INSTALL_DIR}")
+set(INCDIR "${PSBLAS_INSTALL_DIR}/${PSB_CMAKE_INSTALL_INCLUDEDIR}")
+set(MODDIR "${PSBLAS_INSTALL_DIR}/${PSB_CMAKE_INSTALL_MODULDIR}")
+set(LIBDIR "${PSBLAS_INSTALL_DIR}/${PSB_CMAKE_INSTALL_LIBDIR}")
+
+
 # Include directories for the project
 include_directories(${PSBLAS_INSTALL_DIR})
 
@@ -218,6 +221,22 @@ endif()
 
 
 
+#------------------------------------------
+# Configure the amg_config.h file
+#------------------------------------------
+
+message(STATUS "bin dir ${CMAKE_CURRENT_BINARY_DIR}; source dir ${CMAKE_CURRENT_SOURCE_DIR};;")
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/amgprec/amg_config.h.in 
+    ${CMAKE_CURRENT_BINARY_DIR}/include/amg_config.h 	
+    @ONLY  # Replace variables only
+)
+
+
+
+#---------------------------------------
+# Add the AMG libraries
+#---------------------------------------
 
 
 
@@ -226,6 +245,8 @@ endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/amgprec/CMakeLists.txt)  # include amgprec_source_files and amgprec_source_C_files source files
 
+include_directories("${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}")
+
 add_library(amgprec_C OBJECT ${amgprec_source_C_files})
 
 target_link_libraries(amgprec_C
@@ -308,10 +329,10 @@ target_link_libraries(amgcbind
 
 
 
-install(DIRECTORY "${CMAKE_BINARY_DIR}/include" DESTINATION "include"
+install(DIRECTORY "${CMAKE_BINARY_DIR}/include" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
   FILES_MATCHING PATTERN "*.h")
 
-install(DIRECTORY "${CMAKE_BINARY_DIR}/modules" DESTINATION "modules"
+install(DIRECTORY "${CMAKE_BINARY_DIR}/modules" DESTINATION "${CMAKE_INSTALL_MODULDIR}"
   FILES_MATCHING PATTERN "*.mod")
 
 
diff --git a/amgprec/CMakeLists.txt b/amgprec/CMakeLists.txt
index b2f50503..87a91b72 100644
--- a/amgprec/CMakeLists.txt
+++ b/amgprec/CMakeLists.txt
@@ -7,7 +7,7 @@ set(AMG_amgprec_source_files
   amg_d_ilu_fact_mod.f90
 #  amg_z_hybrid_aggregator_mod.F90
   amg_c_base_smoother_mod.f90
-  amg_s_matchboxp_mod.f90
+  amg_s_matchboxp_mod.F90
   amg_c_gs_solver.f90
   amg_z_prec_type.f90
   amg_s_base_solver_mod.f90
@@ -764,7 +764,7 @@ set(AMG_amgprec_source_files
   amg_d_invt_solver.f90
   amg_c_id_solver.f90
   amg_base_ainv_mod.F90
-  amg_d_matchboxp_mod.f90
+  amg_d_matchboxp_mod.F90
   amg_z_base_smoother_mod.f90
   amg_s_invk_solver.f90
   amg_c_base_solver_mod.f90