Skip to content

Commit 23e9f3d

Browse files
committed
Fix compatibility with procps-ng 4.0.5
Do not install translated man pages by default, since there are upstream-provided translated man pages.
1 parent a27486a commit 23e9f3d

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,22 @@ cmake_minimum_required(VERSION 3.12)
44
# SPDX-License-Identifier: CC0-1.0 OR BSD-2-Clause
55

66
include(GNUInstallDirs)
7-
project(manpages-zh VERSION 1.6.4.0 HOMEPAGE_URL "https://github.com/man-pages-zh/manpages-zh")
7+
project(manpages-zh VERSION 1.6.4.1 HOMEPAGE_URL "https://github.com/man-pages-zh/manpages-zh")
88

99
option(ENABLE_APPEND_COLOPHON "Append translation information to output man pages" ON)
1010
option(ENABLE_ZHCN "Enable installing zh_CN man pages" ON)
1111
option(ENABLE_ZHTW "Enable installing zh_TW man pages" ON)
12+
option(ENABLE_PROCPS_NG_MANPAGES "Enable installing procps-ng man pages" OFF)
1213

1314
set(EXCLUDED_MANPAGES "" CACHE STRING "Man pages that are not installed")
1415

16+
if (NOT ENABLE_PROCPS_NG_MANPAGES)
17+
SET(PROCPS_NG_EXCLUDE "free.1;pgrep.1;pidof.1;pmap.1;ps.1;pwdx.1;slabtop.1;tload.1;sysctl.8;vmstat.8;uptime.1;w.1;watch.1;top.1;procps.3;procps_misc.3;procps_pids.3;sysctl.conf.5")
18+
list(APPEND EXCLUDED_MANPAGES ${PROCPS_NG_EXCLUDE})
19+
endif()
20+
21+
list(REMOVE_DUPLICATES EXCLUDED_MANPAGES)
22+
1523
list(LENGTH EXCLUDED_MANPAGES EXCLUDED_MANPAGES_SIZE)
1624
if (EXCLUDED_MANPAGES_SIZE GREATER 0)
1725
message(STATUS "Will exclude ${EXCLUDED_MANPAGES_SIZE} man pages:")

ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2024-12-20 Boyuan Yang <073plan@gmail.com>
2+
3+
* CMakeLists.txt: Exclude procps-ng man pages by default for procps-ng
4+
4.0.5 compatibilty. For more details, see
5+
https://groups.google.com/g/i18n-zh/c/AYHJNyutI9Y/m/bt9QDdsUBAAJ
6+
* CMakeLists.txt: Add option for installng procps-ng man pages.
7+
* Bump version string to 1.6.4.1.
8+
19
2022-12-09 Boyuan Yang <073plan@gmail.com>
210

311
* CMakeLists.txt: Migrate build system to CMake.

0 commit comments

Comments
 (0)