diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-10 13:22:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-10 13:22:01 +0200 |
| commit | 4ff2a680abe170175f8cbcbfa02d0e4899a418a1 (patch) | |
| tree | 2bc2644665ea09b8a1d235e9f0bc6ddd70260443 /CMakeLists.txt | |
| parent | 1e7dd85028100b78039618789eb24c0185d8be17 (diff) | |
| download | mariadb-git-4ff2a680abe170175f8cbcbfa02d0e4899a418a1.tar.gz | |
MDEV-6565 search order for my.cnf inconsistent in docs/use, and global override with build-time -DDEFAULT_SYSCONFDIR is ignored
don't let INSTALL_SYSCONFDIR overwrite DEFAULT_SYSCONFDIR
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfcf06c04a1..75f24629995 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -337,7 +337,7 @@ ELSE() ENDIF() SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}") SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") -IF(INSTALL_SYSCONFDIR) +IF(INSTALL_SYSCONFDIR AND NOT DEFAULT_SYSCONFDIR) SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") ENDIF() |