[petsc] 01/02: reorganise build of doc package

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit b52b8cff52d798518c19c6e31deaaad5add0a5a8
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Sep 30 23:04:48 2015 +0800

    reorganise build of doc package
    
    Include the tutorials and the documentation for the include files,
    placed in the debug directory.
---
 debian/petsc3.6.1-doc.docs |  1 +
 debian/rules               | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/petsc3.6.1-doc.docs b/debian/petsc3.6.1-doc.docs
index 1686b46..cc6dfc9 100644
--- a/debian/petsc3.6.1-doc.docs
+++ b/debian/petsc3.6.1-doc.docs
@@ -1,3 +1,4 @@
 debian/README.Debian
 makefile.html
 docs
+tutorials
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index ff0a1dd..71c1feb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,12 +48,14 @@ PETSC_VERSION=3.6.1$(PETSC_EXT)
 # PETSC_NAME is the install dir under /usr/lib and the base for package names
 PETSC_NAME=petsc$(PETSC_VERSION)
 
-PACKAGE_INSTALL_DIR=debian/tmp/$(PETSC_NAME)
-PACKAGE_DEBUG_INSTALL_DIR=debian/tmp/$(PETSC_NAME)-dbg
 
+PETSC_DIR_PREFIX=/usr/lib/petsc/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-opt
+PETSC_DIR_DEBUG_PREFIX=/usr/lib/petsc/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-debug
 
-PETSC_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-opt
-PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-cxx-debug
+PACKAGE_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)
+PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)
+PACKAGE_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-dbg
+PACKAGE_DEBUG_INSTALL_DIR=$(PACKAGE_DEBUG_INSTALL_BASEDIR)/$(PETSC_DIR_DEBUG_PREFIX)
 
 CONFIGURATION_OPTIONS=--with-shared-libraries \
 	  --useThreads 0 --with-clanguage=C++ --with-c-support \
@@ -111,7 +113,6 @@ override_dh_auto_build:
 
 
 override_dh_auto_test:
-	ls -l /usr/lib/x86_64-linux-gnu/libfakeroot/
 	dh_auto_test -plibpetsc3.6.1-dbg -- \
 	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
 	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_DEBUG_BUILD_DIR)/lib
@@ -128,6 +129,11 @@ override_dh_auto_install:
           DESTDIR=$(PACKAGE_INSTALL_DIR) \
           PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR)
 
+override_dh_installdocs:
+	dh_installdocs
+	dh_install -p$(PETSC_NAME)-doc --sourcedir $(PACKAGE_DEBUG_INSTALL_BASEDIR) --autodest $(PETSC_DIR_DEBUG_PREFIX)/include/*html
+	dh_install -p$(PETSC_NAME)-doc --sourcedir $(PACKAGE_DEBUG_INSTALL_BASEDIR) --autodest $(PETSC_DIR_DEBUG_PREFIX)/include/petsc/*/*html
+
 
 # dh_installchangelogs can't handle a directory of changelog files, so skip them here
 override_dh_installchangelogs:

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