 -            # Remove the lib prefix on the DLL (but not the import library
 +            # Remove the lib prefix on the DLL (but not the import library)
              set_target_properties(glfw PROPERTIES PREFIX "")
-
+ 
              # Add a suffix to the import library to avoid naming conflicts
 @@ -98,7 +98,7 @@ if (BUILD_SHARED_LIBS)
          target_compile_options(glfw PRIVATE "-fno-common")
-
+ 
          set_target_properties(glfw PROPERTIES
 -                              INSTALL_NAME_DIR "lib${LIB_SUFFIX}")
 +                              INSTALL_NAME_DIR "${CMAKE_INSTALL_LIBDIR}")

 set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
 set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
-set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib will be installed: lib or lib64")

 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

@@ -28,6 +27,8 @@ option(GLFW_INSTALL "Generate installation target" ON)
 option(GLFW_VULKAN_STATIC "Use the Vulkan loader statically linked into application" OFF)
 option(GLFW_DOCUMENT_INTERNALS "Include internals in documentation" OFF)

+include(GNUInstallDirs)
+
 if (WIN32)

@@ -356,7 +357,7 @@ endforeach()
 #--------------------------------------------------------------------
 include(CMakePackageConfigHelpers)
 
-set(GLFW_CONFIG_PATH "lib${LIB_SUFFIX}/cmake/glfw3")
+set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
 
 configure_package_config_file(src/glfw3Config.cmake.in
                               src/glfw3Config.cmake
@@ -393,7 +394,7 @@ endif()
