diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-25 13:16:13 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-03-25 13:16:13 +0100 |
| commit | b462a3e0b384f008ac9d413e84eb3b9495ef8c7f (patch) | |
| tree | 6918ba86a1c341d8e5ca979b4c57f47518ff9c4f | |
| parent | 651aeb62ec80c0dcaddb47ed2412c0d40bed9df5 (diff) | |
| download | mariadb-git-b462a3e0b384f008ac9d413e84eb3b9495ef8c7f.tar.gz | |
Don't install documentation when INSTALL_LAYOUT=RPM, as the spec file
prefers to take docs directly from the source tree.
| -rwxr-xr-x | CMakeLists.txt | 37 | ||||
| -rwxr-xr-x | cmake/install_layout.cmake | 4 |
2 files changed, 24 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0445e2a3d5b..c23733d039f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,21 +274,28 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() INCLUDE(CPack) -INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} OPTIONAL) -INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR}) IF(UNIX) INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR}) - INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR}) 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} - 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 -) +# +# RPM installs documentation directly from the source tree +# +IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES COPYING EXCEPTIONS-CLIENT LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} OPTIONAL) + INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR}) + IF(UNIX) + INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR}) + 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} + 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 + ) +ENDIF() diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 1919aacfe43..8640d8ec315 100755 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -121,8 +121,8 @@ ENDIF() SET(INSTALL_SBINDIR_RPM "sbin") SET(INSTALL_SHAREDIR_RPM "share") # -SET(INSTALL_DOCDIR_RPM "${INSTALL_SHAREDIR_RPM}/mysql/doc/MySQL-server-${MYSQL_NO_DASH_VERSION}") -SET(INSTALL_DOCREADMEDIR_RPM "${INSTALL_DOCDIR_RPM}") +#SET(INSTALL_DOCDIR_RPM "XXXunset") +#SET(INSTALL_DOCREADMEDIR_RPM "${INSTALL_DOCDIR_RPM}") SET(INSTALL_INFODIR_RPM "${INSTALL_SHAREDIR_RPM}/info") SET(INSTALL_MANDIR_RPM "${INSTALL_SHAREDIR_RPM}/man") SET(INSTALL_MYSQLDATADIR_RPM "var") |