update rpm spec and use variables in cmake instead of hardcoded paths (#624)

1 files changed, 9 insertions, 3 deletions

diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
index c38e7de0..7a96abcf 100644
--- a/cmake/ModulePackage.cmake
+++ b/cmake/ModulePackage.cmake
@@ -89,10 +89,10 @@ function(install_module lib)
       VERSION ${SOVERSION}
       SOVERSION ${SOVERSION_MAJOR}
     )
-    install(TARGETS ${lib}_shared DESTINATION "lib")
+    install(TARGETS ${lib}_shared DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
   if(ENABLE_STATIC)
-    install(TARGETS ${lib}_static DESTINATION "lib")
+    install(TARGETS ${lib}_static DESTINATION ${CMAKE_INSTALL_LIBDIR})
   endif()
 
   string(REPLACE ";" " " ${lib}_PKGCONFIG_LIBS "${${lib}_PKGCONFIG_LIBS}")
@@ -104,9 +104,15 @@ function(install_module lib)
     @ONLY
   )
 
+  configure_file(
+    "${toxcore_SOURCE_DIR}/other/rpm/${lib}.spec.in"
+    "${CMAKE_BINARY_DIR}/${lib}.spec"
+    @ONLY
+  )
+
   install(FILES
     ${CMAKE_BINARY_DIR}/${lib}.pc
-    DESTINATION "lib/pkgconfig")
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
   foreach(sublib ${${lib}_API_HEADERS})
     string(REPLACE "^" ";" sublib ${sublib})