diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-13 21:26:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-17 07:37:39 +0200 |
| commit | 93144b9e92d3d4fee3247895c1e06e8e7cfedcaa (patch) | |
| tree | 4bce2d9ade92511564cf48f93eb6cc810c2eb5be | |
| parent | 52516706c86f9f66c76836eabde7e2477694bac3 (diff) | |
| download | mariadb-git-93144b9e92d3d4fee3247895c1e06e8e7cfedcaa.tar.gz | |
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.
| -rw-r--r-- | scripts/CMakeLists.txt | 8 |
1 files 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 |