Revert "Follow up fix to PXB-3316 : Remove doc folder to fix Snyk iss…

…ues"

This reverts commit a627557.

cmake/make_dist.cmake.in

@@ -142,6 +142,18 @@ 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)

man/CMakeLists.txt

@@ -26,10 +26,6 @@ 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()

sql/CMakeLists.txt

@@ -1237,6 +1237,10 @@ 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