Merge r6059 (fix for: docs path hardwired (Dennis Lubert))

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6060

diff --git a/docs/Makefile.am b/docs/Makefile.am
index ab039e0ee6100f8345b6c72ba455b0d86e6af557..00d3e3a4893869a8730e11a86d07795695298216 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -55,7 +55,7 @@ XSL_HTML_CHUNK_STYLE  = $(mylibdir)/vg-html-chunk.xsl
 XSL_FO_STYLE          = $(mylibdir)/vg-fo.xsl
 XSL_TEXT_STYLE        = $(mylibdir)/vg-faq2txt.xsl
 XSL_WEBSITE_STYLE     = $(mylibdir)/vg-html-website.xsl
-XSL_MAN_STYLE = /usr/share/xml/docbook/stylesheet/nwalsh/1.69.0/manpages/docbook.xsl
+XSL_MAN_STYLE = /usr/share/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl
 
 all-docs: FAQ.txt man-page html-docs print-docs
 

diff --git a/docs/lib/vg-html-common.xsl b/docs/lib/vg-html-common.xsl
index 283204f21cbde7c6a0e1231faa42344f23218868..4fa7212832bc1360f193c1dd7428e4bdb78ffd58 100644 (file)
--- a/docs/lib/vg-html-common.xsl
+++ b/docs/lib/vg-html-common.xsl
@@ -11,6 +11,9 @@
 <!-- '/usr/share/xml/docbook/stylesheet/nwalsh/1.69.0/html/'  -->
 <!-- has been edited to remove 'article' and 'refentry'       -->
 <!-- so that separate titlepages don't get generated for them -->
+<!-- Note [Dec.1 2005, JRS]: ../1.69.0/.. was changed to      -->
+<!-- ../current/.. in docs/Makefile.am, since the latter is a -->
+<!-- symlink to the former, at least on SuSE 10.0.            -->
 
 
 <!-- use 8859-1 encoding -->