diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-10 09:10:42 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-10 09:11:42 +0000 |
| commit | f5c514ff5c64e6c2f532a2626b0c7237743d70af (patch) | |
| tree | 7e7769e6dd917e99b1a8462707f8b59d918b4022 /main/mariadb/fix-mysql-install-db-path.patch | |
| parent | 82f98d3450b94406d57ec96f85e728d3c81f20af (diff) | |
| download | aports-f5c514ff5c64e6c2f532a2626b0c7237743d70af.tar.bz2 aports-f5c514ff5c64e6c2f532a2626b0c7237743d70af.tar.xz | |
main/mariadb: rebase installdb patch. Fixes #5101
Diffstat (limited to 'main/mariadb/fix-mysql-install-db-path.patch')
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/main/mariadb/fix-mysql-install-db-path.patch b/main/mariadb/fix-mysql-install-db-path.patch new file mode 100644 index 0000000000..f1409aba74 --- /dev/null +++ b/main/mariadb/fix-mysql-install-db-path.patch @@ -0,0 +1,33 @@ +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -175,23 +175,13 @@ + # i.e. makes access relative the current directory. This matches + # the documentation, so better not change this. + +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(prefix ".") +- SET(bindir ${prefix}/${INSTALL_BINDIR}) +- SET(sbindir ${prefix}/${INSTALL_SBINDIR}) +- SET(scriptdir ${prefix}/${INSTALL_BINDIR}) +- SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) +- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +- SET(localstatedir ${prefix}/data) +-ELSE() +- SET(prefix "${CMAKE_INSTALL_PREFIX}") +- SET(bindir ${INSTALL_BINDIRABS}) +- SET(sbindir ${INSTALL_SBINDIRABS}) +- SET(scriptdir ${INSTALL_BINDIRABS}) +- SET(libexecdir ${INSTALL_SBINDIRABS}) +- SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) +- SET(localstatedir ${MYSQL_DATADIR}) +-ENDIF() ++SET(prefix "${CMAKE_INSTALL_PREFIX}") ++SET(bindir ${prefix}/${INSTALL_BINDIR}) ++SET(sbindir ${prefix}/${INSTALL_SBINDIR}) ++SET(scriptdir ${prefix}/${INSTALL_BINDIR}) ++SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) ++SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) ++SET(localstatedir ${MYSQL_DATADIR}) + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh |