diff options
| author | Daniel Nephin <dnephin@docker.com> | 2016-07-22 16:34:46 -0400 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2016-07-26 14:43:35 +0200 |
| commit | 5b667c7c55194364495b1ac23ca425da8db6a76f (patch) | |
| tree | e0d77e435ca8e29850ec61d23a3489913af41164 | |
| parent | c5531b033a6a7c95d224fe0ba3c0e3e80f9da601 (diff) | |
| download | docker-5b667c7c55194364495b1ac23ca425da8db6a76f.tar.gz | |
Require manpages for packages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 1ea9c19ffe53811931ecd3102703c3eacb22d14c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| -rw-r--r-- | hack/make/build-deb | 3 | ||||
| -rw-r--r-- | hack/make/build-rpm | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hack/make/build-deb b/hack/make/build-deb index 98fc00782a..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 - make manpages || 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 5d61dc98cc..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 - make manpages || 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 (.*) \((.*)\)$" |