From 12b0f73a9e9cef35395d0a1560a51604c1c054ff Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 16 Aug 2024 09:54:59 +0200 Subject: [PATCH] CMake: Don't hard-code "libexec" in qt-configure-module If INSTALL_LIBEXECDIR was set to something != "libexec", qt-configure-module contained the wrong path to qt-cmake. Fixes: QTBUG-128137 Pick-to: 6.5 6.7 6.8 Change-Id: Ic095ff8cb804bbdd72e238e75ac867b7cc3bd478 Reviewed-by: Alexey Edelev --- bin/qt-configure-module.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/qt-configure-module.in b/bin/qt-configure-module.in index 06219436188..690fc014782 100755 --- a/bin/qt-configure-module.in +++ b/bin/qt-configure-module.in @@ -69,7 +69,7 @@ opttmpfilepath=${outpathPrefix}/config.opt.in redofilepath=${outpathPrefix}/config.redo.last redotmpfilepath=${outpathPrefix}/config.redo.in -qt_cmake_private_path="$script_dir_path/../libexec" +qt_cmake_private_path="$script_dir_path/../@INSTALL_LIBEXECDIR@" fresh_requested_arg= if [ -z "$optfile" ]; then # only write optfile if not currently redoing