diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index 235c0cb3b4a6..b6e6b23f731c 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -142,18 +142,6 @@ IF(NOT EXISTS ${PACKAGE_DIR}/Docs/INFO_SRC) CREATE_INFO_SRC(${PACKAGE_DIR}/Docs) ENDIF() -# Add xtrabackup man pages -SET(MAN_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/storage/innobase/xtrabackup/doc/source/build/man) -SET(MAN_PKG_DIR ${PACKAGE_DIR}/storage/innobase/xtrabackup/doc/source/build/man) - -IF(EXISTS ${MAN_BIN_DIR}) - FILE(GLOB MAN_FILES RELATIVE ${MAN_BIN_DIR} ${MAN_BIN_DIR}/*.1) - FOREACH(MAN_FILE ${MAN_FILES}) - CONFIGURE_FILE(${MAN_BIN_DIR}/${MAN_FILE} - ${MAN_PKG_DIR}/${MAN_FILE} COPYONLY) - ENDFOREACH() -ENDIF() - # In case we used CPack, it could have copied some # extra files that are not usable on different machines. FILE(REMOVE ${PACKAGE_DIR}/CMakeCache.txt) diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 673aaabaca3d..520efe5e343c 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -26,6 +26,10 @@ FILE(GLOB MAN1_NDB ndb*.1) FILE(GLOB MAN8 *.8) FILE(GLOB MAN8_NDB ndb*.8) +IF (WITH_XTRABACKUP) + RETURN() +ENDIF() + IF(MAN1_NDB AND NOT WITH_NDB) LIST(REMOVE_ITEM MAN1 ${MAN1_NDB}) ENDIF() diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 24a1f0082eab..b46aa43cddde 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -1237,10 +1237,6 @@ ADD_CUSTOM_TARGET(dist WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -IF(WITH_MAN_PAGES) - ADD_DEPENDENCIES(dist man) -ENDIF() - ADD_CUSTOM_TARGET(distclean COMMAND ${CMAKE_COMMAND} -E echo WARNING: distclean target is not functional COMMAND ${CMAKE_COMMAND} -E echo Use 'git clean -fdx' instead