Index: scalapack/CMakeLists.txt
===================================================================
--- scalapack.orig/CMakeLists.txt	2025-01-11 18:10:27.156833587 +0100
+++ scalapack/CMakeLists.txt	2025-01-11 18:10:27.152833563 +0100
@@ -79,7 +79,7 @@
 
 include(GNUInstallDirs)
 macro(SCALAPACK_install_library lib)
-  install(TARGETS ${lib} EXPORT scalapack-targets
+  install(TARGETS ${lib} EXPORT scalapack${LIBNAME_SUFFIX}-targets
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}
     RUNTIME DESTINATION Testing
@@ -241,6 +241,7 @@
 
 if (NOT MSVC)
    add_library(scalapack ${blacs} ${tools} ${tools-C} ${extra_lapack} ${pblas} ${pblas-F} ${ptzblas} ${ptools} ${pbblas} ${redist} ${src} ${src-C})
+   set_target_properties(scalapack PROPERTIES OUTPUT_NAME scalapack${LIBNAME_SUFFIX}-${MPI_FLAVOR} )
    set_target_properties(scalapack PROPERTIES
     VERSION ${SCALAPACK_VERSION}
     SOVERSION ${SCALAPACK_VERSION_MAJOR}.${SCALAPACK_VERSION_MINOR})
@@ -303,7 +304,7 @@
 # --------------------------------------------------
 
 
-export(TARGETS scalapack FILE scalapack-targets.cmake)
+export(TARGETS scalapack FILE scalapack${LIBNAME_SUFFIX}-targets.cmake)
 
 if( NOT LAPACK_FOUND )
  install(FILES
@@ -313,23 +314,23 @@
 endif( NOT LAPACK_FOUND )
 
 configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-version.cmake.in
-  ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake @ONLY)
+  ${SCALAPACK_BINARY_DIR}/scalapack${LIBNAME_SUFFIX}-config-version.cmake @ONLY)
 configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-build.cmake.in
-  ${SCALAPACK_BINARY_DIR}/scalapack-config.cmake @ONLY)
+  ${SCALAPACK_BINARY_DIR}/scalapack${LIBNAME_SUFFIX}-config.cmake @ONLY)
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scalapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/scalapack.pc)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scalapack.pc.in ${CMAKE_CURRENT_BINARY_DIR}/scalapack${LIBNAME_SUFFIX}-${MPI_FLAVOR}.pc)
  install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/scalapack.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/scalapack${LIBNAME_SUFFIX}-${MPI_FLAVOR}.pc
   DESTINATION ${PKG_CONFIG_DIR}
    )
 
 configure_file(${SCALAPACK_SOURCE_DIR}/CMAKE/scalapack-config-install.cmake.in
-  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake @ONLY)
+  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack${LIBNAME_SUFFIX}-config.cmake @ONLY)
 install(FILES
-  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
-  ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack-${SCALAPACK_VERSION}
+  ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack${LIBNAME_SUFFIX}-config.cmake
+  ${SCALAPACK_BINARY_DIR}/scalapack${LIBNAME_SUFFIX}-config-version.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack${LIBNAME_SUFFIX}-${SCALAPACK_VERSION}.${MPI_FLAVOR}
   )
 
-install(EXPORT scalapack-targets
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack-${SCALAPACK_VERSION})
+install(EXPORT scalapack${LIBNAME_SUFFIX}-targets
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scalapack${LIBNAME_SUFFIX}-${SCALAPACK_VERSION}.${MPI_FLAVOR})
Index: scalapack/scalapack.pc.in
===================================================================
--- scalapack.orig/scalapack.pc.in	2025-01-11 18:10:27.156833587 +0100
+++ scalapack/scalapack.pc.in	2025-01-11 18:10:27.152833563 +0100
@@ -1,9 +1,9 @@
 prefix=@prefix@
 libdir=@libdir@
 
-Name: scalapack
+Name: scalapack@LIBNAME_SUFFIX@
 Description: SCALAPACK reference implementation
 Version: @SCALAPACK_VERSION@
 URL: http://www.netlib.org/scalapack/
-Libs: -L${libdir} -lscalapack
-Requires: mpi lapack blas
+Libs: -L${libdir} -lscalapack@LIBNAME_SUFFIX@-@MPI_FLAVOR@
+Requires: mpi lapack@LIBNAME_SUFFIX@ blas@LIBNAME_SUFFIX@
Index: scalapack/CMAKE/scalapack-config-build.cmake.in
===================================================================
--- scalapack.orig/CMAKE/scalapack-config-build.cmake.in	2025-01-11 18:10:27.156833587 +0100
+++ scalapack/CMAKE/scalapack-config-build.cmake.in	2025-01-11 18:10:27.152833563 +0100
@@ -1 +1 @@
-include("@SCALAPACK_BINARY_DIR@/scalapack-targets.cmake")
+include("@SCALAPACK_BINARY_DIR@/scalapack@LIBNAME_SUFFIX@-targets.cmake")
Index: scalapack/CMAKE/scalapack-config-install.cmake.in
===================================================================
--- scalapack.orig/CMAKE/scalapack-config-install.cmake.in	2025-01-11 18:10:27.156833587 +0100
+++ scalapack/CMAKE/scalapack-config-install.cmake.in	2025-01-11 18:10:27.152833563 +0100
@@ -1,2 +1,2 @@
 get_filename_component(_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(${_SELF_DIR}/scalapack-targets.cmake)
+include(${_SELF_DIR}/scalapack@LIBNAME_SUFFIX@-targets.cmake)