X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=debian%2Frules;h=5d2f15908c83bd74eaa13893dba994da75c9b1c4;hb=155e2da43497ec305ae7e716a0f34056ea708855;hp=2b7db7573353296b314faa3cfb2e8b64077ab6dd;hpb=84adab31e2d11153f8f83eafc4cc54af5deb7806;p=deb_dpdk.git

diff --git a/debian/rules b/debian/rules
index 2b7db757..5d2f1590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,12 @@ else
     PAR := "1"
 endif
 
+ifneq (,$(findstring nodocs,$(DEB_BUILD_OPTIONS)))
+BUILD_DOCS=n
+else
+BUILD_DOCS=y
+endif
+
 # kernel_modules can be passed via DEB_BUILD_OPTIONS to enable building the
 # optional binary kernel modules package. By default it will be built against
 # the current kernel, or ksrc can be passed with a path to the target kernel
@@ -159,14 +165,18 @@ endif
 	dh_auto_configure
 
 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
+endif
 
 override_dh_auto_install-indep:
 	# Package: dpdk-doc
 	# All files based on the install-doc rule (includes examples)
+ifeq (y,$(BUILD_DOCS))
 	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) prefix=/usr \
 		DESTDIR=debian/dpdk-doc install-doc
+endif
 
 override_dh_auto_build-arch:
 	$(MAKE) -j $(PAR) V=$(DH_VERBOSE) O=$(DPDK_STATIC_DIR) RTE_KERNELDIR=$(KSRC) build
@@ -270,9 +280,9 @@ override_dh_auto_install-arch:
 		debian/dpdk-rte-kni-dkms/usr/src/dpdk-rte-kni-$(VERSION)
 ifneq (,$(KVERS))
 	# Package: dpdk-modules-<kernel version>
-	mkdir -p debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
-	cp -a debian/build/shared-root/kmod/* \
-		debian/dpdk-modules-$(KVERS)/lib/modules/$(KVERS)/kernel/drivers/net
+	$(MAKE) V=$(DH_VERBOSE) O=$(DPDK_SHARED_DIR) \
+		kerneldir=/lib/modules/$(KVERS)/extra/dpdk \
+		DESTDIR=debian/dpdk-modules-$(KVERS) install-kmod
 endif
 
 debian/libethdev4.links: debian/libethdev4.links.in