diff options
| author |   Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2017-05-19 10:48:43 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2017-05-22 09:07:13 +0200 |
| commit | 784bf02aa60bcb6db6cdc57af06a0ec4e6c8add8 (patch) | |
| tree | 8908cd4211f41b45186abfbced4951b9ad089282 | |
| parent | bfc76e8a86292e59f442aba7d3cdb1510a652608 (diff) | |
debian/rules: fix man pages on non-x86
These were built only in the arch indep, and therefore usually x86 only.
Due to that dh:_installman only picked it up there.
Move the make target to the binary section, so that the man pages will
be packaged along the executables.
Update in v2
- keep it in the BUILD_DOC wrapper to be able to skip it with
nodoc build option.
Change-Id: I6aa6f2d78014de7764b6a8804711570b0194f66d
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
| -rwxr-xr-x | debian/rules | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 3a4b3197..b2a059ad 100755 --- a/debian/rules +++ b/debian/rules @@ -172,8 +172,7 @@ endif override_dh_auto_build-indep: ifeq (y,$(BUILD_DOCS)) - $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html \ - doc-guides-man + $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) doc-api-html doc-guides-html endif override_dh_auto_install-indep: @@ -201,6 +200,10 @@ endif sed -ri 's,(RTE_BUILD_SHARED_LIB=).*,\1y,' \ $(DPDK_SHARED_DIR)/.config $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) build +ifeq (y,$(BUILD_DOCS)) + # need to be around for dh_installman to be picked up + $(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) RTE_KERNELDIR=$(KSRC) doc-guides-man +endif override_dh_auto_install-arch: LIBDIR=/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_install-arch: |