diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2015-04-05 21:09:30 +0200 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2015-04-05 21:09:30 +0200 |
| commit | 106a5eae5aada153c5e806fc2579466f0eca58dd (patch) | |
| tree | ee76b4f08753d860822b5577e18e95e90cbb5f1b /main/mariadb/fix-mysql-install-db-path.patch | |
| parent | 645728cbbd89554cb04d8c1bdb58808a757c8105 (diff) | |
| download | aports-106a5eae5aada153c5e806fc2579466f0eca58dd.tar.bz2 aports-106a5eae5aada153c5e806fc2579466f0eca58dd.tar.xz | |
main/mariadb: fix script path and etc location
Diffstat (limited to 'main/mariadb/fix-mysql-install-db-path.patch')
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 27 |
1 files changed, 27 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..6fe385958c --- /dev/null +++ b/main/mariadb/fix-mysql-install-db-path.patch @@ -0,0 +1,27 @@ +--- a/scripts/CMakeLists.txt.orig ++++ b/scripts/CMakeLists.txt +@@ -180,22 +180,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 ".") +-ELSE() +- SET(prefix "${CMAKE_INSTALL_PREFIX}") +-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}) +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(localstatedir ${prefix}/data) +-ELSE() +- SET(localstatedir ${MYSQL_DATADIR}) +-ENDIF() ++SET(localstatedir ${MYSQL_DATADIR}) + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh |