Message ID | 1459177015-8937-1-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
This has already been ACK'ed, so I'm just applying it to trusty immediately. The "cherry picked" line references a vivid SHA (this isn't an upstream commit) so isn't relevant; dropping it. -Kamal
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 5afbbf4..168a3b5 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -42,8 +42,9 @@ ifeq ($(do_doc_package_content),true) if [ -z "$(AUTOBUILD)" ]; then \ install -d $(docdir)/$(doc_pkg_name)-tmp; \ $(kmake) O=$(docdir)/$(doc_pkg_name)-tmp htmldocs; \ - mv $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook \ - $(docdir)/html; \ + install -d $(docdir)/html; \ + rsync -aL $(docdir)/$(doc_pkg_name)-tmp/Documentation/DocBook/ \ + $(docdir)/html/; \ rm -rf $(docdir)/$(doc_pkg_name)-tmp; \ fi endif