Skip to content

Commit b468777

Browse files
satya-bodapatifmbiete
authored andcommitted
Revert "Follow up fix to PXB-3316 : Remove doc folder to fix Snyk issues"
This reverts commit a627557.
1 parent 3459b44 commit b468777

3 files changed

Lines changed: 16 additions & 4 deletions

File tree

cmake/make_dist.cmake.in

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,18 @@ IF(NOT EXISTS ${PACKAGE_DIR}/Docs/INFO_SRC)
142142
CREATE_INFO_SRC(${PACKAGE_DIR}/Docs)
143143
ENDIF()
144144

145+
# Add xtrabackup man pages
146+
SET(MAN_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}/storage/innobase/xtrabackup/doc/source/build/man)
147+
SET(MAN_PKG_DIR ${PACKAGE_DIR}/storage/innobase/xtrabackup/doc/source/build/man)
148+
149+
IF(EXISTS ${MAN_BIN_DIR})
150+
FILE(GLOB MAN_FILES RELATIVE ${MAN_BIN_DIR} ${MAN_BIN_DIR}/*.1)
151+
FOREACH(MAN_FILE ${MAN_FILES})
152+
CONFIGURE_FILE(${MAN_BIN_DIR}/${MAN_FILE}
153+
${MAN_PKG_DIR}/${MAN_FILE} COPYONLY)
154+
ENDFOREACH()
155+
ENDIF()
156+
145157
# In case we used CPack, it could have copied some
146158
# extra files that are not usable on different machines.
147159
FILE(REMOVE ${PACKAGE_DIR}/CMakeCache.txt)

man/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ FILE(GLOB MAN1_NDB ndb*.1)
2626
FILE(GLOB MAN8 *.8)
2727
FILE(GLOB MAN8_NDB ndb*.8)
2828

29-
IF (WITH_XTRABACKUP)
30-
RETURN()
31-
ENDIF()
32-
3329
IF(MAN1_NDB AND NOT WITH_NDB)
3430
LIST(REMOVE_ITEM MAN1 ${MAN1_NDB})
3531
ENDIF()

sql/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,6 +1237,10 @@ ADD_CUSTOM_TARGET(dist
12371237
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
12381238
)
12391239

1240+
IF(WITH_MAN_PAGES)
1241+
ADD_DEPENDENCIES(dist man)
1242+
ENDIF()
1243+
12401244
ADD_CUSTOM_TARGET(distclean
12411245
COMMAND ${CMAKE_COMMAND} -E echo WARNING: distclean target is not functional
12421246
COMMAND ${CMAKE_COMMAND} -E echo Use 'git clean -fdx' instead

0 commit comments

Comments
 (0)