diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-12-16 21:43:21 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2010-12-16 21:43:21 +0300 |
| commit | 3237e4908af80113f680fb0c07591516a53d0251 (patch) | |
| tree | e72d1f36026b483d70db595d0a5286439884444e /cmake | |
| parent | 47b774b21c7f2fa600bae2b7193805a25d286b54 (diff) | |
| parent | 33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (diff) | |
| download | mariadb-git-3237e4908af80113f680fb0c07591516a53d0251.tar.gz | |
Manual merge from mysql-5.5.
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") |