summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorJoerg Bruehe <joerg.bruehe@oracle.com>2012-06-11 12:11:02 +0200
committerJoerg Bruehe <joerg.bruehe@oracle.com>2012-06-11 12:11:02 +0200
commit3da15359523931c6e0e0a00cf0d0703316ee6117 (patch)
tree1e131ae2eda95fea782a826fc8ee13efed8bb586 /cmake
parenta61c7c3821fdb0c74f5d12096125185a9f53fcb9 (diff)
downloadmariadb-git-3da15359523931c6e0e0a00cf0d0703316ee6117.tar.gz
More changes to supporting the build of RPMs for ULN
from the MySQL 5.5 source tree. Contrary to the comment, the spec file for these ULN RPMs was missing in the previous changeset (blame ".bzrignore"). This change now brings said spec file, and it adds cmake handling for the new files. Still for internal tool tests only, not yet ready for publishing.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/install_layout.cmake7
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")