Merge pull request #25063 from thaJeztah/man-page-cherry
cherry-pick manpages fix
diff --git a/hack/make/build-deb b/hack/make/build-deb
index 41b2eda..e2a4e92 100644
--- a/hack/make/build-deb
+++ b/hack/make/build-deb
@@ -35,8 +35,7 @@
debDate="$(date --rfc-2822)"
# if go-md2man is available, pre-generate the man pages
- ./man/generate.sh || true
- # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
+ make manpages
builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
pkgs=( $(find "${builderDir}/"*/ -type d) )
diff --git a/hack/make/build-rpm b/hack/make/build-rpm
index 995dcd8..b035728 100644
--- a/hack/make/build-rpm
+++ b/hack/make/build-rpm
@@ -51,8 +51,7 @@
rpmDate="$(date +'%a %b %d %Y')"
# if go-md2man is available, pre-generate the man pages
- ./man/generate.sh || true
- # TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
+ make manpages
# Convert the CHANGELOG.md file into RPM changelog format
VERSION_REGEX="^\W\W (.*) \((.*)\)$"
diff --git a/hack/make/ubuntu b/hack/make/ubuntu
index 7033dd5..8de5d9c 100644
--- a/hack/make/ubuntu
+++ b/hack/make/ubuntu
@@ -60,7 +60,7 @@
cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
# Include man pages
- man/generate.sh
+ make manpages
manRoot="$DIR/usr/share/man"
mkdir -p "$manRoot"
for manDir in man/man?; do
