QPID-2724 : Remove fixed version from xsl-stylesheets

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@960954 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 9 insertions, 9 deletions

diff --git a/doc/book/Makefile b/doc/book/Makefile
index 2eb1102aac..ebf4f02975 100644
--- a/doc/book/Makefile
+++ b/doc/book/Makefile
@@ -4,7 +4,7 @@
 #
 #  Apache FOP, version 0.95 or higher
 #  Docbook 4.5
-#  Docbook XSL stylesheets - tested with xsl-stylesheets-1.75.2
+#  Docbook XSL stylesheets - tested with xsl-stylesheets (1.75.2 and 1.65.1-2)
 #  xsltproc
 #  xmllint
 # 
@@ -27,4 +27,4 @@ build/Programming-In-Apache-Qpid:
 	./build-book.sh Programming-In-Apache-Qpid
 
 clean:
-	rm -rf build
\ No newline at end of file
+	rm -rf build pdf
diff --git a/doc/book/README.txt b/doc/book/README.txt
index 2deb20a13b..1dbcee4e0f 100644
--- a/doc/book/README.txt
+++ b/doc/book/README.txt
@@ -7,7 +7,7 @@ You need the following to build the documentation:
 
 - Apache FOP, version 0.95 or higher
 - Docbook 4.5
-- Docbook XSL stylesheets - I have tested with xsl-stylesheets-1.75.2
+- Docbook XSL stylesheets - Tested with xsl-stylesheets (1.75.2 & 1.65.1-2)
 - xsltproc
 - xmllint
 
diff --git a/doc/book/build-book.sh b/doc/book/build-book.sh
index 5d8be9bf51..2949c5a0df 100755
--- a/doc/book/build-book.sh
+++ b/doc/book/build-book.sh
@@ -20,16 +20,16 @@ cp -r src/images build/$1/html-single
 cp -r src/images build/$1/html
 
 # Create single-page .html
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/docbook.xsl src/$1.xml >build/$1/html-single/$1.html
+xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl src/$1.xml >build/$1/html-single/$1.html
 
 # Create chunked .html
 INFILE=$(readlink -f src/$1.xml)
 pushd build/$1/html
-xsltproc --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/chunk.xsl $INFILE
+xsltproc --xinclude --stringparam  chunk.section.depth 1  --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl $INFILE
 popd
 
 # Create the .fo
-xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/fo/docbook.xsl src/$1.xml >build/$1/pdf/$1.fo
+xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1 /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl src/$1.xml >build/$1/pdf/$1.fo
 
 # Use Apache FOP to create the PDF
 fop build/$1/pdf/$1.fo build/$1/pdf/$1.pdf
diff --git a/doc/book/build-chapter.sh b/doc/book/build-chapter.sh
index f4fb94c57a..2dbfbf74d3 100755
--- a/doc/book/build-chapter.sh
+++ b/doc/book/build-chapter.sh
@@ -17,10 +17,10 @@ mkdir -p pdf
 
 
 # Create the .html
-xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/html/docbook.xsl src/$1.xml >build/$1.html
+xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl src/$1.xml >build/$1.html
 
 # Create the .fo
-xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/fo/docbook.xsl src/$1.xml >build/$1.fo
+xsltproc --stringparam  section.autolabel 1 /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl src/$1.xml >build/$1.fo
 
 # Use Apache FOP to create the PDF
 fop build/$1.fo pdf/$1.pdf
diff --git a/doc/book/build.sh b/doc/book/build.sh
index fd78ef79e8..cf9236bff8 100755
--- a/doc/book/build.sh
+++ b/doc/book/build.sh
@@ -16,7 +16,7 @@ mkdir -p pdf
 xmllint --xinclude src/Book.xml >build/qpid-book.xml
 
 # Create the .fo
-xsltproc /usr/share/sgml/docbook/xsl-stylesheets-1.75.2/fo/docbook.xsl build/qpid-book.xml >build/qpid-book.fo
+xsltproc /usr/share/sgml/docbook/xsl-stylesheets/fo/docbook.xsl build/qpid-book.xml >build/qpid-book.fo
 
 # Use Apache FOP to create the PDF
 fop build/qpid-book.fo pdf/qpid-book.pdf