From e2f01665287fc25f1bf5714305c9a6171c7ed2c8 Mon Sep 17 00:00:00 2001
From: Slávek Banko <slavek.banko@axis.cz>
Date: Sun, 22 Feb 2026 16:54:47 +0100
Subject: Use default CMAKE_INSTALL_LIBDIR from GNUInstallDirs for
 LIB_INSTALL_DIR.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 modules/TDESetupPaths.cmake | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/TDESetupPaths.cmake b/modules/TDESetupPaths.cmake
index 97b565d..b821f28 100644
--- a/modules/TDESetupPaths.cmake
+++ b/modules/TDESetupPaths.cmake
@@ -9,6 +9,12 @@
 #
 #################################################
 
+#################################################
+#####
+##### Use GNUInstallDirs
+include( GNUInstallDirs OPTIONAL )
+
+
 #################################################
 #####
 ##### tde_internal_setup_path
@@ -37,7 +43,11 @@ macro( tde_setup_paths )
   _tde_internal_setup_path( SHARE_INSTALL_PREFIX      "${CMAKE_INSTALL_PREFIX}/share"               "Base directory for files which go to share/" )
   _tde_internal_setup_path( BIN_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/bin"                  "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)" )
   _tde_internal_setup_path( SBIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/sbin"                 "The install dir for system executables (default ${EXEC_INSTALL_PREFIX}/sbin)" )
-  _tde_internal_setup_path( LIB_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
+  if( CMAKE_INSTALL_LIBDIR )
+    _tde_internal_setup_path( LIB_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"     "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})" )
+  else()
+    _tde_internal_setup_path( LIB_INSTALL_DIR           "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})" )
+  endif()
   _tde_internal_setup_path( LIBEXEC_INSTALL_DIR       "${LIB_INSTALL_DIR}/trinity/libexec"             "The subdirectory relative to the install prefix where libraries will be installed (default is ${LIB_INSTALL_DIR}/trinity/libexec)" )
   _tde_internal_setup_path( PKGCONFIG_INSTALL_DIR     "${LIB_INSTALL_DIR}/pkgconfig"                "The install dir for pkg-config metadata files" )
   _tde_internal_setup_path( INCLUDE_INSTALL_DIR       "${CMAKE_INSTALL_PREFIX}/include"             "The subdirectory to the header prefix" )
-- 
cgit v1.2.3