diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
| commit | c6b904abf8a139a3b95c9825cc7c53fd8f1a6fd0 (patch) | |
| tree | a0d8f4957cf9d256a3cc3445c7db25384f97e249 /cmake | |
| parent | 28a5059a92707e009aada358bf103fa386ea7c2c (diff) | |
| parent | 3d799bdffd04beba3dad4f1ece915104b0284157 (diff) | |
| download | mariadb-git-c6b904abf8a139a3b95c9825cc7c53fd8f1a6fd0.tar.gz | |
merge mysql-5.5->mysql-5.5-bugteam
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 19a8a61df2d..601e208d96d 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -26,7 +26,7 @@ # Build as per default RPM layout, with prefix=/usr # # DEB -# Build as per STANDALONE, prefix=/opt/mysql-$major.$minor +# Build as per STANDALONE, prefix=/opt/mysql/server-$major.$minor # # SVR4 # Solaris package layout suitable for pkg* tools, prefix=/opt/mysql/mysql @@ -74,7 +74,7 @@ IF(UNIX) IF(INSTALL_LAYOUT MATCHES "RPM") SET(default_prefix "/usr") ELSEIF(INSTALL_LAYOUT MATCHES "DEB") - SET(default_prefix "/opt/${MYSQL_BASE_VERSION}") + 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) ELSEIF(INSTALL_LAYOUT MATCHES "SVR4") |