diff options
| author | Tibor Vass <tiborvass@users.noreply.github.com> | 2016-07-26 05:58:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 05:58:54 -0700 |
| commit | 626b1529445c40566d829586d65af1a6c75ff047 (patch) | |
| tree | e0d77e435ca8e29850ec61d23a3489913af41164 | |
| parent | 4ed7f63f0daf1567c6bd5b404f0a3ca7341b2743 (diff) | |
| parent | 5b667c7c55194364495b1ac23ca425da8db6a76f (diff) | |
| download | docker-626b1529445c40566d829586d65af1a6c75ff047.tar.gz | |
Merge pull request #25063 from thaJeztah/man-page-cherry
cherry-pick manpages fix
| -rw-r--r-- | hack/make/build-deb | 3 | ||||
| -rw-r--r-- | hack/make/build-rpm | 3 | ||||
| -rw-r--r-- | hack/make/ubuntu | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/hack/make/build-deb b/hack/make/build-deb index 41b2eda94c..e2a4e921b6 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -35,8 +35,7 @@ set -e 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 995dcd8bba..b03572815f 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -51,8 +51,7 @@ set -e 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 7033dd5484..8de5d9ceac 100644 --- a/hack/make/ubuntu +++ b/hack/make/ubuntu @@ -60,7 +60,7 @@ bundle_ubuntu() { 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 |