diff options
| author | Daniel Fischer <df@sun.com> | 2010-05-28 16:50:23 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-05-28 16:50:23 +0200 |
| commit | d6fe8c47b88faf5074f55d698a9b9af97d17fdd4 (patch) | |
| tree | 45b3312e9c1c09d4bc210b41984397935d1f04c5 | |
| parent | 458d0e7ae06016f56614c602d7e5be568779937a (diff) | |
| download | mariadb-git-d6fe8c47b88faf5074f55d698a9b9af97d17fdd4.tar.gz | |
post-merge fix 1
| -rwxr-xr-x | CMakeLists.txt | 13 | ||||
| -rwxr-xr-x | scripts/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 43c1c2ea095..fa691042026 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,19 +282,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc) -INSTALL(FILES EXCEPTIONS-CLIENT DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT - Development) - - -INSTALL(FILES COPYING DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme OPTIONAL) -INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) -IF(UNIX) - INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Documentation) -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) # Packaging IF(WIN32) SET(CPACK_GENERATOR "ZIP") diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 483e4bcef65..633b9b8ff90 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -177,7 +177,7 @@ ENDIF() INSTALL_SCRIPT( "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db${EXT}" - DESTINATION ${INSTALL_BINDIR} + DESTINATION ${DEST} COMPONENT Server ) |