From ea839618c4177250cd8e7a35cceb2353701ffaf6 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@mysql.com>
Date: Fri, 19 Feb 2010 18:30:08 +0100
Subject: Fix some glitches with INSTALL_LAYOUT=STANDALONE - mysql_install_db
 is in scripts dir now - sql-bench is installed -some extra support-files (e.g
 ini) are in support-files

---
 support-files/CMakeLists.txt | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'support-files/CMakeLists.txt')

diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index ff98a7dd885..85be470e21b 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -31,11 +31,20 @@ ELSE()
   SET(ini_file_extension "cnf")
 ENDIF()
 
+IF(UNIX)
+  IF(INSTALL_LAYOUT MATCHES "STANDALONE")
+    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+  ELSE()
+    SET(inst_location ${INSTALL_DOCREADMEDIR})
+  ENDIF()
+ELSE()
+  SET(inst_location ${INSTALL_DOCREADMEDIR})
+ENDIF()
+
 FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${INSTALL_DOCREADMEDIR})
-
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} DESTINATION ${inst_location})
 ENDFOREACH()
 
 IF(UNIX)
@@ -47,10 +56,9 @@ IF(UNIX)
     SET(inst_location ${INSTALL_MYSQLSHAREDIR})
   ENDIF()
 
-  FILE(GLOB ndb_ini_files ${CMAKE_CURRENT_SOURCE_DIR}/*.ini)
-  INSTALL(FILES ${ndb_ini_files}  DESTINATION  ${inst_location})
-
-  FOREACH(script  mysqld_multi.server mysql-log-rotate)
+ 
+  FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
+    config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
 
-- 
cgit v1.2.1


From aba006b7671e1f7eafcbada2ff95417e8d7b6f52 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jonathan.perkin@oracle.com>
Date: Mon, 22 Mar 2010 15:16:52 +0100
Subject: Try to fix SVR4 packages.

---
 support-files/CMakeLists.txt | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'support-files/CMakeLists.txt')

diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 85be470e21b..9cd373c6e9c 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -31,14 +31,12 @@ ELSE()
   SET(ini_file_extension "cnf")
 ENDIF()
 
-IF(UNIX)
-  IF(INSTALL_LAYOUT MATCHES "STANDALONE")
-    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
-  ELSE()
-    SET(inst_location ${INSTALL_DOCREADMEDIR})
-  ENDIF()
-ELSE()
+# XXX: shouldn't we just have variables for all this stuff and centralise
+# XXX: their configuration in install_layout.cmake?
+IF(WIN32)
   SET(inst_location ${INSTALL_DOCREADMEDIR})
+ELSE()
+  SET(inst_location ${INSTALL_SUPPORTFILESDIR})
 ENDIF()
 
 FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
@@ -48,14 +46,13 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
 ENDFOREACH()
 
 IF(UNIX)
+  # XXX: again, used elsewhere (scripts/), should be standardised in
+  # XXX: install_layout.cmake
   IF(INSTALL_LAYOUT MATCHES "STANDALONE")
     SET(prefix ".")
-    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
   ELSE()
     SET(prefix ${CMAKE_INSTALL_PREFIX})
-    SET(inst_location ${INSTALL_MYSQLSHAREDIR})
   ENDIF()
-
  
   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
-- 
cgit v1.2.1


From c7ed531ce6345997edfb602e1e177ed0e7f26991 Mon Sep 17 00:00:00 2001
From: Jonathan Perkin <jonathan.perkin@oracle.com>
Date: Thu, 1 Apr 2010 20:47:19 +0200
Subject: Expand @HOSTNAME@.

---
 support-files/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'support-files/CMakeLists.txt')

diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index 9cd373c6e9c..d748b4b195c 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -29,6 +29,7 @@ ELSE()
   SET(CXXFLAGS ${CMAKE_CXX_FLAGS})
   SET(MYSQLD_USER "mysql")
   SET(ini_file_extension "cnf")
+  SET(HOSTNAME "hostname")
 ENDIF()
 
 # XXX: shouldn't we just have variables for all this stuff and centralise
-- 
cgit v1.2.1