[nfft] 04/13: Simplify installation of documentation.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/experimental
in repository nfft.

commit b09b64372eeaaf8e35ac4865bf4c3157c2faa0e5
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Dec 9 12:40:45 2015 +0000

    Simplify installation of documentation.
---
 debian/libnfft3-doc.install |  1 +
 debian/rules                | 14 ++++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/debian/libnfft3-doc.install b/debian/libnfft3-doc.install
new file mode 100644
index 0000000..d5d7710
--- /dev/null
+++ b/debian/libnfft3-doc.install
@@ -0,0 +1 @@
+*/doc/html/* usr/share/doc/libnfft3-doc/html
diff --git a/debian/rules b/debian/rules
index d590b89..f24951e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,16 +83,6 @@ ifeq "" "$(DH_SKIP_NFFTL)"
 		--package=libnfft3-long2
 endif
 
-override_dh_auto_install-indep:
-	# Nothing to do here.
-
-override_dh_installdocs-arch:
-	dh_installdocs --arch
-
-override_dh_installdocs-indep:
-	dh_installdocs --indep $(CURDIR)/build-indep/doc/html
-	dh_doxygen --indep
-
 override_dh_auto_test-arch:
 ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 # Disable testsuite for {armel,mips} due to potential timeout.
@@ -106,3 +96,7 @@ ifeq (,$(filter armel mips, $(DEB_HOST_ARCH)))
 #endif
 endif
 endif
+
+override_dh_installdocs-indep:
+	dh_installdocs --indep
+	dh_doxygen --indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nfft.git