diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ab137e..2445200 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,16 +188,18 @@ endif()
 
 # Generate openmesh.pc file
 
+include(GNUInstallDirs)
+
 set(DEST_DIR "${CMAKE_INSTALL_PREFIX}")
 set(PRIVATE_LIBS "-lOpenMeshCore -lOpenMeshTools")
 
 configure_file("openmesh.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc" @ONLY)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc DESTINATION libdata/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openmesh.pc DESTINATION share/pkgconfig)
 
 # generate target file
 
-install(EXPORT OpenMeshConfig DESTINATION share/OpenMesh/cmake)
+install(EXPORT OpenMeshConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenMesh)
 
 export(TARGETS OpenMeshCore OpenMeshTools FILE OpenMeshConfig.cmake)
 
diff --git a/cmake-library/VCI/VCICommon.cmake b/cmake-library/VCI/VCICommon.cmake
index 1bbacca..d185c5f 100644
--- a/cmake-library/VCI/VCICommon.cmake
+++ b/cmake-library/VCI/VCICommon.cmake
@@ -53,10 +53,13 @@ elseif (APPLE)
   set (VCI_PROJECT_PLUGINDIR "${VCI_PROJECT_LIBDIR}/plugins")
   set (VCI_PROJECT_BINDIR "bin")
 else ()
-  set (VCI_PROJECT_DATADIR "share/${CMAKE_PROJECT_NAME}")
-  set (VCI_PROJECT_LIBDIR "lib${LIB_SUFFIX}")
-  set (VCI_PROJECT_PLUGINDIR "${VCI_PROJECT_LIBDIR}/plugins")
-  set (VCI_PROJECT_BINDIR "bin")
+
+  include(GNUInstallDirs)
+
+  set (VCI_PROJECT_DATADIR ${CMAKE_INSTALL_DATADIR})
+  set (VCI_PROJECT_LIBDIR ${CMAKE_INSTALL_LIBDIR})
+  set (VCI_PROJECT_PLUGINDIR "${CMAKE_INSTALL_LIBDIR}/OpenMesh/plugins")
+  set (VCI_PROJECT_BINDIR ${CMAKE_INSTALL_BINDIR})
 endif ()
 
 # allow a project to modify the directories
