diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2014-05-12 15:21:23 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2014-05-12 15:21:23 +0200 |
| commit | 5228395a310e7f57911a76c1dc1542c0d0df87cb (patch) | |
| tree | e0ad1df5ffa444e3a12b97f585169f895533885b /scripts/CMakeLists.txt | |
| parent | 2b8a41a6c40210c4a2e5c861ca6d0ed61fb1a8d4 (diff) | |
| download | mariadb-git-5228395a310e7f57911a76c1dc1542c0d0df87cb.tar.gz | |
Backport from trunk:
Bug #18382225 MYSQL_CONFIG CAN'T HANDLE RELOCABLE PACKAGES THAT USES "LIB64" OR "-64" SUFFIX
'lib' is hardcoded into mysql_config, so 'cmake -DINSTALL_LIBDIR=lib64' will not work.
Use INSTALL_LIBDIR when generating mysql_config.
mysql_config may be renamed to e.g. mysql_config-32, fix the basedir pattern matching.
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rw-r--r-- | scripts/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 6596396191a..5e03acb654b 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -223,6 +223,7 @@ SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) SET(scriptdir ${prefix}/${INSTALL_BINDIR}) SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +SET(libsubdir ${INSTALL_LIBDIR}) SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR}) SET(pkglibdir ${prefix}/${INSTALL_LIBDIR}) SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR}) |