diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 10:53:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-31 10:53:56 +0200 |
| commit | 2daf3b14fe2aa9f0f126420beffcc8cb12b87d5e (patch) | |
| tree | 1a4e5184577cba470e4c325112a86046ddd5d24c /man | |
| parent | f37a56de3cb795883f5a799f6de9fc475d5feaae (diff) | |
| parent | 0b36c27e0c06b798b7322ab07d8464b69a7b716c (diff) | |
| download | mariadb-git-2daf3b14fe2aa9f0f126420beffcc8cb12b87d5e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'man')
| -rw-r--r-- | man/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index cc3f2701a77..5acec2ede67 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2012, Monty Program Ab +# Copyright (c) 2012, 2020, MariaDB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 - mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 + perror.1 replace.1 resolve_stack_dump.1 resolveip.1 mariadb-service-convert.1 mysqld_safe_helper.1 wsrep_sst_common.1 wsrep_sst_mysqldump.1 wsrep_sst_rsync.1 @@ -37,7 +37,8 @@ SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1 mysql_plugin.1 mysql_embedded.1) SET(MAN1_DEVEL mysql_config.1) SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1 my_safe_process.1) + mysqltest.1 mysqltest_embedded.1 mysql_client_test_embedded.1 + my_safe_process.1) INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) |