From 9ba1995060ebb1c65ac9855e3671b3992c859059 Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Tue, 13 Feb 2018 23:13:01 +0300
Subject: [PATCH] lib != lib64, lib != lib32

---
 CPackCommonRules.cmake     |  6 +++++-
 PkgConfigCommonRules.cmake |  6 +++++-
 ValaLibCommonRules.cmake   | 13 +++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/CPackCommonRules.cmake b/CPackCommonRules.cmake
index f4c4f9c..9ff677a 100644
--- a/CPackCommonRules.cmake
+++ b/CPackCommonRules.cmake
@@ -12,7 +12,11 @@ SET (CPACK_PACKAGE_DESCRIPTION_FILE
     "${CMAKE_SOURCE_DIR}/README")
 SET (pkgconfig_file "${PROJECT_BINARY_DIR}/pkg-config/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc")
 IF (EXISTS ${pkgconfig_file})
-  INSTALL (FILES ${pkgconfig_file} DESTINATION lib/pkgconfig)
+  SET (lib "lib")
+  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    SET (lib "lib64")
+  ENDIF()
+  INSTALL (FILES ${pkgconfig_file} DESTINATION ${lib}/pkgconfig)
 ENDIF ()
 #SET (CPACK_NSIS_PACKAGE_NAME "${PROJECT_NAME}")
 #SET (CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}")
diff --git a/PkgConfigCommonRules.cmake b/PkgConfigCommonRules.cmake
index 28d36c0..49a2645 100644
--- a/PkgConfigCommonRules.cmake
+++ b/PkgConfigCommonRules.cmake
@@ -4,7 +4,11 @@ ELSE (WIN32)
   SET (PkgConfigPrefix ${CMAKE_INSTALL_PREFIX})
 ENDIF (WIN32)
 SET (PkgConfigExecPrefix "\${prefix}")
-SET (PkgConfigLibDir "\${exec_prefix}/lib")
+SET (lib "lib")
+IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  SET (lib "lib64")
+ENDIF()
+SET (PkgConfigLibDir "\${exec_prefix}/${lib}")
 SET (PkgConfigIncludeDir "\${prefix}/include")
 
 SET (PkgConfigName "${CMAKE_PROJECT_NAME}")
diff --git a/ValaLibCommonRules.cmake b/ValaLibCommonRules.cmake
index 709554f..e7af956 100644
--- a/ValaLibCommonRules.cmake
+++ b/ValaLibCommonRules.cmake
@@ -42,12 +42,13 @@ IF (LibIsPlugin)
   SET (install_prefix "/${LibInstallPrefix}/${LibName}-${MAJOR}")
 ENDIF (LibIsPlugin)
 
+SET (lib "lib")
+IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+  SET (lib "lib64")
+ENDIF()
+
 IF (UNIX)
-  IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    SET (install_dest lib64${install_prefix})
-  ELSE()
-    SET (install_dest lib${install_prefix})
-  ENDIF()
+  SET (install_dest ${lib}${install_prefix})
   #INCLUDE (GNUInstallDirs)
   #SET (install_dest ${CMAKE_INSTALL_FULL_LIBDIR}${install_prefix})
 ELSEIF (WIN32)
@@ -61,7 +62,7 @@ IF (LibInstall)
   ELSE (LibNoApi)
     INSTALL (TARGETS ${LibName} RUNTIME DESTINATION ${install_dest}
                                 LIBRARY DESTINATION ${install_dest}
-                                ARCHIVE DESTINATION lib)
+                                ARCHIVE DESTINATION ${lib})
     INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LibName}-${MAJOR}.h DESTINATION include)
     INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${LibName}-${MAJOR}.vapi DESTINATION share/vala/vapi)
   ENDIF (LibNoApi)