blob: 6fe385958c17702f16fd391fbccf0d7c7e85d534 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
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
|