diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-06-08 20:13:55 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-06-08 20:13:55 +0300 |
| commit | efa48b2148fe0b7f4527aea20782e9913ae28b65 (patch) | |
| tree | 6fe0e5e7754da72f4e92be30534eb2db975203cf /cmake | |
| parent | 56ea8e9c0539a4dc95659ab4ba4b94956c7119e7 (diff) | |
| parent | cb6109cde188b5e018f2169e43bb08ac2bc3e68f (diff) | |
| download | mariadb-git-efa48b2148fe0b7f4527aea20782e9913ae28b65.tar.gz | |
Merge with 5.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 1210c50d6cf..3ad6da5d433 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -77,9 +77,7 @@ IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") SET(default_prefix "/usr") ELSEIF(INSTALL_LAYOUT MATCHES "DEB") - SET(default_prefix "/opt/mysql/server-${MYSQL_BASE_VERSION}") - # This is required to avoid "cpack -GDEB" default of prefix=/usr - SET(CPACK_SET_DESTDIR ON) + SET(default_prefix "/usr") ELSEIF(INSTALL_LAYOUT MATCHES "SVR4") SET(default_prefix "/opt/mysql/mysql") ELSE() @@ -191,7 +189,7 @@ SET(INSTALL_SUPPORTFILESDIR_DEB "support-files") SET(INSTALL_MYSQLDATADIR_DEB "/var/lib/mysql") SET(INSTALL_PLUGINTESTDIR_DEB ${plugin_tests}) -SET(INSTALL_UNIX_ADDRDIR_DEB "/tmp/mysql.sock") +SET(INSTALL_UNIX_ADDRDIR_DEB "/var/run/mysqld/mysqld.sock") # # SVR4 layout # |