diff -rupN cfitsio-4.0.0/CMakeLists.txt cfitsio-4.0.0-new/CMakeLists.txt
--- cfitsio-4.0.0/CMakeLists.txt	2021-12-05 18:53:20.783367424 +0100
+++ cfitsio-4.0.0-new/CMakeLists.txt	2021-12-05 18:53:31.230316658 +0100
@@ -219,7 +219,7 @@ ENDIF()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
 set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
+set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/cfitsio/")
 set (BIN_DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
 
 SET(H_FILES fitsio.h fitsio2.h longnam.h)
@@ -275,7 +275,9 @@ IF (BZIP2_FOUND)
 ENDIF(BZIP2_FOUND)
 
 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION})
-install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION})
+IF(WIN32)
+    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SUFFIX "-${${PROJECT_NAME}_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ENDIF(WIN32)
 install(TARGETS ${LIB_NAME}
                             RUNTIME DESTINATION bin
                             LIBRARY DESTINATION lib
@@ -309,9 +311,11 @@ IF (UTILS)
 
     ADD_EXECUTABLE(FPack fpack.c fpackutil.c)
     TARGET_LINK_LIBRARIES(FPack ${LIB_NAME})
+    INSTALL(TARGETS FPack DESTINATION bin)
 
     ADD_EXECUTABLE(Funpack funpack.c fpackutil.c)
     TARGET_LINK_LIBRARIES(Funpack ${LIB_NAME})
+    INSTALL(TARGETS Funpack DESTINATION bin)
 
     ADD_EXECUTABLE(Fitscopy fitscopy.c)
     TARGET_LINK_LIBRARIES(Fitscopy ${LIB_NAME})
diff -rupN cfitsio-4.0.0/cfitsio.pc.cmake cfitsio-4.0.0-new/cfitsio.pc.cmake
--- cfitsio-4.0.0/cfitsio.pc.cmake	2021-05-20 03:18:54.000000000 +0200
+++ cfitsio-4.0.0-new/cfitsio.pc.cmake	2021-12-07 14:22:11.677952182 +0100
@@ -7,6 +7,6 @@ Name: cfitsio
 Description: FITS File Subroutine Library
 URL: https://heasarc.gsfc.nasa.gov/fitsio/
 Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@.@CFITSIO_MICRO@
-Libs: -L${libdir} @PKG_CONFIG_LIBS@
+Libs: -L${libdir} -l@LIB_NAME@
 Libs.private: -lm
 Cflags: -I${includedir}