[linux] 02/02: debian/rules.real: Update install-doc rule for change to Sphinx HTML output

[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 c391b26e8fed6c9474193dac0da707df513f7a97
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Oct 29 04:04:27 2016 +0100

    debian/rules.real: Update install-doc rule for change to Sphinx HTML output
    
    I can't see when or why this changed, but the HTML (and related) files
    are now being generated in Documentation/output and not an html
    subdirectory of that.
---
 debian/rules.real | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/rules.real b/debian/rules.real
index 418d7db..31d6250 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -240,8 +240,9 @@ install-doc: $(STAMPS_DIR)/build-doc
 	find * -name '*.html' -print | \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/oldstyle'
 	set -o pipefail; \
-	cd $(DIR)/Documentation/output/html; \
-	find * -name objects.inv -prune -o -print | \
+	cd $(DIR)/Documentation/output; \
+	find * -name '*.rst' -prune -o -name objects.inv -prune \
+		-o -name xml -prune -o -print | \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(OUT_DIR)/html/newstyle'
 	gzip -9nqfr $(OUT_DIR)/Documentation
 	+$(MAKE_SELF) install-base

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