diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-01-28 13:52:47 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-01-28 18:27:18 +0200 |
| commit | 07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e (patch) | |
| tree | ab0cc1147989574ba6f9d7a56f274478b013f37b | |
| parent | a134ec37364bf7f006a73cf8eda212cec6a4f2cc (diff) | |
| download | mariadb-git-07e34cddb66da2e9e4ab5bdd8d52d1a72c2d2e8e.tar.gz | |
MDEV-14330: move tokudb manpages to right packages
Move tokuftdump and tokuft_logprint man pages to storage/tokudb.
The man pages are now part of tokudb-engine cmake component. This change
is mostly for RPM & DEB based packaging generated through CMake & CPack.
Debian upstream already handles this change via the custom scripts in debian/
| -rw-r--r-- | man/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | storage/tokudb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/man/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/man/tokuft_logprint.1 (renamed from man/tokuft_logprint.1) | 0 | ||||
| -rw-r--r-- | storage/tokudb/man/tokuftdump.1 (renamed from man/tokuftdump.1) | 0 |
5 files changed, 6 insertions, 2 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index 0dd4004f22f..cc3f2701a77 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -23,10 +23,10 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mariadb-service-convert.1 - mysqld_safe_helper.1 tokuftdump.1 wsrep_sst_common.1 + mysqld_safe_helper.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 wsrep_sst_xtrabackup-v2.1 wsrep_sst_xtrabackup.1 - galera_recovery.1 galera_new_cluster.1 tokuft_logprint.1 + galera_recovery.1 galera_new_cluster.1 mysql_ldb.1 wsrep_sst_mariabackup.1 mbstream.1 mariabackup.1 wsrep_sst_rsync_wan.1) diff --git a/storage/tokudb/CMakeLists.txt b/storage/tokudb/CMakeLists.txt index f22f7c1d6b5..088a24f827b 100644 --- a/storage/tokudb/CMakeLists.txt +++ b/storage/tokudb/CMakeLists.txt @@ -168,3 +168,5 @@ TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") + +ADD_SUBDIRECTORY(man) diff --git a/storage/tokudb/man/CMakeLists.txt b/storage/tokudb/man/CMakeLists.txt new file mode 100644 index 00000000000..192d8117119 --- /dev/null +++ b/storage/tokudb/man/CMakeLists.txt @@ -0,0 +1,2 @@ +SET(MAN1_TOKUDB tokuftdump.1 tokuft_logprint.1) +INSTALL(FILES ${MAN1_TOKUDB} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT tokudb-engine) diff --git a/man/tokuft_logprint.1 b/storage/tokudb/man/tokuft_logprint.1 index d6f69e0aeeb..d6f69e0aeeb 100644 --- a/man/tokuft_logprint.1 +++ b/storage/tokudb/man/tokuft_logprint.1 diff --git a/man/tokuftdump.1 b/storage/tokudb/man/tokuftdump.1 index 79129a1a2e1..79129a1a2e1 100644 --- a/man/tokuftdump.1 +++ b/storage/tokudb/man/tokuftdump.1 |