fix CPU_COUNT with DOC_OPTIONS

diff --git a/debian/rules b/debian/rules
index bc5c534b43fad8afb53299980680a28632d7d127..0a8b853e41f7c86fe546621939c3d9bf79b180e4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,18 +22,24 @@ else
   config_opt = --enable-optimising
 endif
 
+DOC_OPTIONS := WEB_TARGETS="offline"
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+       DOC_OPTIONS := $(DOC_OPTIONS) $(DEB_BUILD_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
+endif
+
 %:
-       dh --parallel $@
+       dh $@ --parallel --with-autotools-dev
 
 
 override_dh_auto_configure: 
        dh_auto_configure -- --disable-checking --enable-debugging $(config_opt)
 
-build-indep: 
-       $(MAKE) -j1 doc WEB_TARGETS="offline"
+override_dh_auto_build-indep:
+       dh_auto_build
+       $(MAKE) $(DOC_OPTIONS) doc
 
-build-arch:
-       dh_auto_build -a
+override_dh_auto_install-indep:
+       $(MAKE) install-doc prefix=$(CURDIR)/debian/tmp/usr/
 
 ## this rule will update debian/control and the per-language install
 ## files; all of the files it generates/modifies should be included in
@@ -103,6 +109,3 @@ update-doc-packages:
 ##     dh_gencontrol
 ##     dh_md5sums
 ##     dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean install binary-indep binary-arch binary