Build and install the new DocBook manuals

Install generated PDF and HTML from the new DocBook manuals.  Install
only ka2heim.txt from the txt directory; the other things in there aren't
horribly useful.  Stop installing the old HTML documentation.  Add the
required additional configure options for the DocBook documentation build.

diff --git a/debian/control b/debian/control
index 594662d784784f543f26f847222bfd9c9108cf44..8e527925975cd3c26b9fadb9cd0456f295c1ed07 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Russ Allbery <rra@debian.org>
 Uploaders: Sam Hartman <hartmans@debian.org>
 Build-Depends: debhelper (>= 7), autoconf, automake, bison, comerr-dev,
- cpio, flex, libkrb5-dev, libncurses5-dev, libpam0g-dev, perl
+ cpio, dblatex, docbook-xsl, flex, libkrb5-dev, libncurses5-dev,
+ libpam0g-dev, libxml2-utils, perl, xsltproc
 Standards-Version: 3.8.1
 Homepage: http://www.openafs.org/
 Vcs-Git: git://git.debian.org/git/pkg-k5-afs/openafs.git

diff --git a/debian/openafs-doc.docs b/debian/openafs-doc.docs
index a02509ef66bd46eafd753cefa0a2aab5ed15bb52..32feb2409e9158b8760ea67cd0bac4349c83a94e 100644 (file)
--- a/debian/openafs-doc.docs
+++ b/debian/openafs-doc.docs
@@ -1,3 +1 @@
-doc/html
-doc/pdf
-doc/txt
+doc/txt/ka2heim.txt

diff --git a/debian/rules b/debian/rules
index 1d04862fa7667b61ef0a856f81e5c417200afd03..0b01b502265b6e231e69fba8ad0e8bd347f13b7d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,12 @@ SYS_NAME  := $(shell sh debian/sysname)
 package    = openafs
 srcpkg     = openafs-modules-source
 dkmspkg    = openafs-modules-dkms
+DOCS       = $(CURDIR)/debian/openafs-doc/usr/share/doc/openafs-doc
+
+# The path to the XSLT used to generate HTML from the DocBook source files.
+# This path is specific to different Linux distributions, so we have to pass
+# it into configure.
+HTML_XSL   = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
 
 # The /usr/share/doc directory for these packages should be a symlink to
 # /usr/share/doc/openafs-client.  Any package on this list must depend on
@@ -94,18 +100,24 @@ build-stamp:
            --sysconfdir=/etc --libexecdir=/usr/lib \
            --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \
            --enable-supergroups --enable-largefile-fileserver \
-           --enable-bos-new-config \
-           --enable-debug --enable-lwp-debug \
+           --enable-bos-new-config --with-xslt-processor=xsltproc \
+           --with-html-xsl=$(HTML_XSL) --enable-debug --enable-lwp-debug \
            $(DEBIAN_OPT_FLAGS) $(SYSTEM)
        chmod a+x config.sub src/libafs/make_kbuild_makefile.pl \
            src/config/make_vnode.pl
        dh build --after configure
        $(MAKE) libafs_tree
+       set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \
+           $(MAKE) -C doc/xml/$$d all ; \
+       done
        touch $@
 
 clean:
        [ ! -f doc/man-pages/pod1/afs-up.pod ] \
            || mv doc/man-pages/pod1/afs-up.pod doc/man-pages/pod1/up.pod
+       set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \
+           [ ! -f doc/xml/$$d/Makefile ] || $(MAKE) -C doc/xml/$$d clean ; \
+       done
        dh clean
 
 install: install-stamp
@@ -120,6 +132,14 @@ install-stamp: build-stamp
        dh_installinit -popenafs-client -r -- defaults 25 20
        dh_installinit -popenafs-fileserver -r
 
+       mkdir -p $(DOCS)/html
+       cp doc/xml/*.gif doc/xml/*.html $(DOCS)/html/
+       set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \
+           mkdir $(DOCS)/html/$$d ; \
+           cp doc/xml/$$d/*.html doc/xml/$$d/*.png $(DOCS)/html/$$d/ ; \
+           cp doc/xml/$$d/*.pdf $(DOCS)/ ; \
+       done
+
        install -d debian/$(srcpkg)/usr/src/modules/$(package)
        cd libafs_tree && find . -print | \
            cpio -admp $(CURDIR)/debian/$(srcpkg)/usr/src/modules/$(package)