From 93144b9e92d3d4fee3247895c1e06e8e7cfedcaa Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 13 Oct 2017 21:26:30 +0200 Subject: [PATCH] MDEV-13440 mysql_install_db fails with hard-coded langdir always search in compile-time specified paths INSTALL_BINDIR, INSTALL_SBINDIR, INSTALL_MYSQLSHAREDIR. User can set them to arbitrary values, it's not enough to search only in their usual values of bin, sbin and libexec, share and share/mysql. --- scripts/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 4f5ecccc159..93ee3e9d2ac 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -205,10 +205,10 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() -SET(resolveip_locations "$basedir/bin") -SET(mysqld_locations "$basedir/libexec $basedir/sbin $basedir/bin") -SET(errmsg_locations "$basedir/share/english $basedir/share/mysql/english") -SET(pkgdata_locations "$basedir/share $basedir/share/mysql") +SET(resolveip_locations "$basedir/${INSTALL_BINDIR} $basedir/bin") +SET(mysqld_locations "$basedir/${INSTALL_SBINDIR} $basedir/libexec $basedir/sbin $basedir/bin") +SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english") +SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql") IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh