[linux] 03/05: split-docs: update rules generation

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 8f6b13987a8eded0b6d1a7388a278766405d8979
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Wed Nov 11 12:45:36 2015 +0100

    split-docs: update rules generation
    
    pass a DO_DOCS variable to rules.gen and rules for the binary-indep
    target
---
 debian/bin/gencontrol.py |  2 ++
 debian/rules.real        | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index a1a4f95..548ec24 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -109,6 +109,8 @@ class Gencontrol(Base):
         makeflags = makeflags.copy()
         makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
         makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
+        if not self.config.merge('docs', None, None).get('enabled', True):
+            makeflags['DO_DOCS'] = False
         super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
 
         # linux-source-$UPSTREAMVERSION will contain all kconfig files
diff --git a/debian/rules.real b/debian/rules.real
index bced6ad..62d8072 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -63,13 +63,17 @@ ifeq ($(MODULES),True)
   binary-arch-flavour: install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 endif
 
-binary-indep: install-doc
-binary-indep: install-manual
+ifneq ($(DO_DOCS),False)
+  binary-indep: install-doc
+  binary-indep: install-manual
+  build-indep: $(STAMPS_DIR)/build-doc
+else
+  build-indep:
+endif
 binary-indep: install-source
 binary-indep: install-support
 
 build-arch: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
-build-indep: $(STAMPS_DIR)/build-doc
 
 setup-flavour: $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git