Fix docbook-xsl installation path

diff --git a/stage3/pkg/docbook-xsl b/stage3/pkg/docbook-xsl
index f613c0a..04fbc42 100644 (file)
--- a/stage3/pkg/docbook-xsl
+++ b/stage3/pkg/docbook-xsl
@@ -3,17 +3,22 @@
 hvbuild()
 {
     cd ${LFS_TMP}/${PACKAGE}
+
     install -v -m 755 -d \
-        /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}
+        /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}
     chown -R root:root .
-    cp -v -R VERSION common eclipse extensions fo highlighting html \
+    cp -v -R VERSION common eclipse epub extensions fo highlighting html \
         htmlhelp images javahelp lib manpages params profiling \
-        slides template tools website xhtml                    \
-        /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}
+        roundtrip slides template tests tools webhelp website \
+        xhtml xhtml-1_1 \
+        /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}
+
+    ln -s VERSION /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}/VERSION.xsl
+
     install -v -m644 -D README \
-        /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VERSION}/README.XSL &&
+        /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VER}/README.XSL &&
     install -v -m755    RELEASE-NOTES* NEWS* \
-        /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VERSION}
+        /usr/share/doc/docbook-xsl-${DOCBOOK_XSL_VER}
 
     if [ ! -f /etc/xml/catalog ]; then
         mkdir -p /etc/xml
@@ -24,11 +29,11 @@ hvbuild()
     fi
     xmlcatalog --noout --add "rewriteSystem" \
         "http://docbook.sourceforge.net/release/xsl/current" \
-        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" \
+        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}" \
         /etc/xml/catalog
     xmlcatalog --noout --add "rewriteURI" \
         "http://docbook.sourceforge.net/release/xsl/current" \
-        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}" \
+        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}" \
         /etc/xml/catalog
     xmlcatalog --noout --add "delegateSystem" \
         "http://docbook.sourceforge.net/release/xsl/" \
@@ -38,6 +43,6 @@ hvbuild()
         "file:///etc/xml/docbook" /etc/xml/catalog
 
     var_add_str "XML_CATALOG_FILES" /etc/profile \
-        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VERSION}/catalog.xml /etc/xml/catalog"
+        "/usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}/catalog.xml /etc/xml/catalog"
     var_export  "XML_CATALOG_FILES" /etc/profile
 }