From f5c514ff5c64e6c2f532a2626b0c7237743d70af Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Wed, 10 Feb 2016 09:10:42 +0000
Subject: main/mariadb: rebase installdb patch. Fixes #5101

---
 main/mariadb/fix-mysql-install-db-path.patch | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 main/mariadb/fix-mysql-install-db-path.patch

(limited to 'main/mariadb/fix-mysql-install-db-path.patch')

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
-- 
cgit v1.2.3