diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-09-21 16:01:53 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-09-21 16:01:53 +0200 |
| commit | d43185e5037ef51b5cd8fad1261397b6b3f0742e (patch) | |
| tree | bbc6b70a1f62dbaa4ed7f94a936c6fea91b6dee8 /cmake | |
| parent | a0e5a5edae98b8ecaf3c4815037b283f0923815c (diff) | |
| parent | 2b3fab95560fbdea0e8a2fd1a573d43b0111942b (diff) | |
| download | mariadb-git-d43185e5037ef51b5cd8fad1261397b6b3f0742e.tar.gz | |
Merge changes for ULN RPMs into main 5.5
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/install_layout.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 9f9dc7dc9a3..036164d868b 100644 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ # # RPM # Build as per default RPM layout, with prefix=/usr +# Note: The layout for ULN RPMs differs, see the "RPM" section. # # DEB # Build as per STANDALONE, prefix=/opt/mysql/server-$major.$minor @@ -134,6 +135,10 @@ SET(INSTALL_PLUGINTESTDIR_STANDALONE ${plugin_tests}) # # RPM layout # +# See "SPECIFIC-ULN/mysql-5.5-libdir.patch" for the differences +# which apply to RPMs in ULN (Oracle Linux), that patch file will +# be applied at build time via "rpmbuild". +# SET(INSTALL_BINDIR_RPM "bin") SET(INSTALL_SBINDIR_RPM "sbin") SET(INSTALL_SCRIPTDIR_RPM "bin") |