Utilize GNUInstallDirs

Author: dralley

CMakeLists.txt

@@ -1,5 +1,5 @@
 PROJECT (createrepo_c C)
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.10)
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
 set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -ggdb -g -Wall -Wextra -Og")

doc/CMakeLists.txt

@@ -10,7 +10,7 @@ endif(DOXYGEN_FOUND)
 
 IF(CREATEREPO_C_INSTALL_MANPAGES)
     INSTALL(FILES createrepo_c.8 mergerepo_c.8 modifyrepo_c.8 sqliterepo_c.8
-            DESTINATION share/man/man8
+            DESTINATION "${CMAKE_INSTALL_MANDIR}/man8"
             COMPONENT bin)
 ENDIF(CREATEREPO_C_INSTALL_MANPAGES)
 

src/CMakeLists.txt

@@ -112,23 +112,18 @@ CONFIGURE_FILE("createrepo_c.pc.cmake" "${CMAKE_SOURCE_DIR}/src/createrepo_c.pc"
 CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY)
 CONFIGURE_FILE("deltarpms.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/deltarpms.h" @ONLY)
 
-IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-    SET (LIB_SUFFIX "64")
-ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-
-SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
 IF (CREATEREPO_C_INSTALL_DEVELOPMENT OR "${createrepo_c_library_type}" STREQUAL "SHARED")
     INSTALL(
         TARGETS libcreaterepo_c
-        RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries
-        LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries
-        ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT Development
+        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development
         )
 ENDIF (CREATEREPO_C_INSTALL_DEVELOPMENT OR "${createrepo_c_library_type}" STREQUAL "SHARED")
 
 IF (CREATEREPO_C_INSTALL_DEVELOPMENT)
-    INSTALL(FILES ${headers} DESTINATION "include/createrepo_c")
-    INSTALL(FILES "createrepo_c.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
+    INSTALL(FILES ${headers} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/createrepo_c")
+    INSTALL(FILES "createrepo_c.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 ENDIF (CREATEREPO_C_INSTALL_DEVELOPMENT)
 
 IF (NOT DEFINED BIN_INSTALL_DIR)