diff options
-rw-r--r-- | handbook/Makefile | 12 | ||||
-rw-r--r-- | handbook/poky-doc-tools/Makefile.am | 8 | ||||
-rwxr-xr-x | handbook/poky-doc-tools/autogen.sh | 2 | ||||
-rw-r--r-- | handbook/poky-doc-tools/common/poky-db-pdf.xsl | 2 | ||||
-rw-r--r-- | handbook/poky-doc-tools/poky-docbook-to-pdf.in | 7 |
5 files changed, 23 insertions, 8 deletions
diff --git a/handbook/Makefile b/handbook/Makefile index 01353b11a..5dff1a874 100644 --- a/handbook/Makefile +++ b/handbook/Makefile @@ -1,7 +1,6 @@ all: html pdf tarball pdf: - ./poky-doc-tools/poky-docbook-to-pdf poky-handbook.xml ./poky-doc-tools/poky-docbook-to-pdf bsp-guide.xml # -- old way -- @@ -11,12 +10,17 @@ XSLTOPTS = --stringparam html.stylesheet style.css \ --stringparam chapter.autolabel 1 \ --stringparam appendix.autolabel 1 \ --stringparam section.autolabel 1 -XSLTOPTS2 = --xinclude /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl + +## +# These URI should be rewritten by your distribution's xml catalog to +# match your localy installed XSL stylesheets. +XSL_BASE_URI = http://docbook.sourceforge.net/release/xsl/current +XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl html: # See http://www.sagehill.net/docbookxsl/HtmlOutput.html - xsltproc $(XSLTOPTS) -o poky-handbook.html $(XSLTOPTS2) poky-handbook.xml - xsltproc $(XSLTOPTS) -o bsp-guide.html $(XSLTOPTS2) bsp-guide.xml + xsltproc $(XSLTOPTS) -o poky-handbook.html $(XSL_XHTML_URI) poky-handbook.xml + xsltproc $(XSLTOPTS) -o bsp-guide.html $(XSL_XHTML_URI) bsp-guide.xml # -- old way -- # xmlto xhtml-nochunks poky-handbook.xml diff --git a/handbook/poky-doc-tools/Makefile.am b/handbook/poky-doc-tools/Makefile.am index ca92ae714..4533cd832 100644 --- a/handbook/poky-doc-tools/Makefile.am +++ b/handbook/poky-doc-tools/Makefile.am @@ -7,7 +7,13 @@ bin_SCRIPTS = poky-docbook-to-pdf edit = sed \ -e 's,@datadir\@,$(pkgdatadir),g' \ -e 's,@prefix\@,$(prefix),g' \ - -e 's,@version\@,@VERSION@,g' + -e 's,@version\@,@VERSION@,g' + +## +# These URI should be rewritten by your distribution's xml catalog to +# match your localy installed XSL stylesheets. +XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current" +XSL_TEMPLATE_URI = $(XSL_BASE_URI)/template/titlepage.xsl poky-docbook-to-pdf: poky-docbook-to-pdf.in rm -f poky-docbook-to-pdf diff --git a/handbook/poky-doc-tools/autogen.sh b/handbook/poky-doc-tools/autogen.sh index 5daa93560..d68a142b8 100755 --- a/handbook/poky-doc-tools/autogen.sh +++ b/handbook/poky-doc-tools/autogen.sh @@ -1,3 +1,3 @@ #! /bin/sh autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode --enable-debug "$@" +./configure "$@" diff --git a/handbook/poky-doc-tools/common/poky-db-pdf.xsl b/handbook/poky-doc-tools/common/poky-db-pdf.xsl index 302e66f64..3dd065a57 100644 --- a/handbook/poky-doc-tools/common/poky-db-pdf.xsl +++ b/handbook/poky-doc-tools/common/poky-db-pdf.xsl @@ -1,7 +1,7 @@ <?xml version='1.0'?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0"> - <xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl"/> + <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl" /> <!-- check project-plan.sh for how this is generated, needed to tweak the cover page diff --git a/handbook/poky-doc-tools/poky-docbook-to-pdf.in b/handbook/poky-doc-tools/poky-docbook-to-pdf.in index cc999ab99..b56aee495 100644 --- a/handbook/poky-doc-tools/poky-docbook-to-pdf.in +++ b/handbook/poky-doc-tools/poky-docbook-to-pdf.in @@ -18,9 +18,14 @@ BASENAME=`basename $1 .xml` || exit 1 FO="$BASENAME.fo" PDF="$BASENAME.pdf" +## +# These URI should be rewritten by your distribution's xml catalog to +# match your localy installed XSL stylesheets. +XSL_BASE_URI="http://docbook.sourceforge.net/release/xsl/current" + xsltproc -o /tmp/titlepage.xsl \ --xinclude \ - /usr/share/xml/docbook/stylesheet/nwalsh/template/titlepage.xsl \ + $XSL_BASE_URI/template/titlepage.xsl \ @datadir@/common/titlepage.templates.xml || exit 1 xsltproc --xinclude \ |