1 files changed, 26 insertions, 48 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79de29ee61b..8b0c4898785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ ENDIF()
 SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
 
-
-
 IF(UNIX AND NOT APPLE)
   # Note, that generally one should not change settings depending
   # on CMAKE_BUILD_TYPE, because VS and Xcode configure once (with
@@ -124,18 +122,30 @@ IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
   SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
 ENDIF()
 
+# Packaging
+IF (NOT CPACK_GENERATOR)
+  IF(WIN32)
+    SET(CPACK_GENERATOR "ZIP")
+  ELSE()
+    SET(CPACK_GENERATOR "TGZ")
+  ENDIF(WIN32) 
+ENDIF(NOT CPACK_GENERATOR)
+
+INCLUDE(mysql_version)
+INCLUDE(cpack_rpm)
+INCLUDE(cpack_source_ignore_files)
+INCLUDE(install_layout)
+
 # Add macros
 INCLUDE(character_sets)
 INCLUDE(zlib)
 INCLUDE(ssl)
 INCLUDE(readline)
-INCLUDE(mysql_version)
 INCLUDE(libutils)
 INCLUDE(dtrace)
 INCLUDE(ctest)
 INCLUDE(plugin)
 INCLUDE(install_macros)
-INCLUDE(install_layout)
 INCLUDE(mysql_add_executable)
 
 # Handle options
@@ -231,8 +241,8 @@ ELSE()
 ENDIF()
 SET(DEFAULT_CHARSET_HOME "${DEFAULT_MYSQL_HOME}")
 SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}")
-IF(SYSCONFDIR)
-  SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
+IF(INSTALL_SYSCONFDIR)
+  SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}")
 ENDIF()
 
 
@@ -341,51 +351,19 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
 
-# Packaging
-IF(WIN32)
-  SET(CPACK_GENERATOR "ZIP")
-ELSE()
-  SET(CPACK_GENERATOR "TGZ")
-ENDIF() 
-
-
-# Create a single package with "make package"
-# (see http://public.kitware.com/Bug/view.php?id=11452)
-SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
-
-INCLUDE(CPack)
+INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
+DESTINATION ${INSTALL_DOCREADMEDIR} 
+COMPONENT Readme
+OPTIONAL
+)
+INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
 IF(UNIX)
-  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
-ENDIF()
-#
-# RPM installs documentation directly from the source tree
-#
-IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-  INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
-  DESTINATION ${INSTALL_DOCREADMEDIR} 
-  COMPONENT Readme
-  OPTIONAL
-  )
-  INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-  INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-  IF(UNIX)
-    INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
-  ENDIF()
-  # MYSQL_DOCS_LOCATON is used in "make dist", points to the documentation directory
-  SET(MYSQL_DOCS_LOCATION "" CACHE PATH "Location from where documentation is copied")
-  MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
-  INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
-    COMPONENT Documentation
-    PATTERN "INSTALL-BINARY" EXCLUDE
-    PATTERN "Makefile.*" EXCLUDE
-    PATTERN "glibc*" EXCLUDE
-    PATTERN "linuxthreads.txt" EXCLUDE
-    PATTERN "myisam.txt" EXCLUDE
-    PATTERN "mysql.info" EXCLUDE
-    PATTERN "sp-imp-spec.txt" EXCLUDE
-  )
+  INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
 ENDIF()
 
+INCLUDE(CPack)
+
 IF(NON_DISTRIBUTABLE_WARNING)
   MESSAGE(WARNING "
 You have linked MariaDB with GPLv3 libraries!  You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.")