Red Hat support added by Dominik, README updated.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11270 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 21 insertions, 28 deletions

diff --git a/DOCS/xml/README b/DOCS/xml/README
index 290363946c..bfa7f2cdee 100644
--- a/DOCS/xml/README
+++ b/DOCS/xml/README
@@ -10,12 +10,16 @@ ones successfully, so they are required:
 
 * xmllint (part of libxml2) is used for validation.
 * xsltproc (part of libxslt1) is used for transforming XML files into HTML
-  files.  Version 1.0.18 or later is recommended.
+  files. Version 1.0.18 or later is recommended.
 
-Also it's possible to use the Saxon XSLT Processor. Russian translator
-used it (version 6.4.4) for a while. If you have suitable JavaVM and a saxon.jar
-installed somewhere, configure will try to detect them. If autodetection fails,
-try to tweak DOCS/xml/configure to get it working and send us a patch :)
+It's also possible to use the Saxon XSLT Processor. The Russian translator
+used it (version 6.4.4) for a while. If you have a suitable JavaVM and a
+saxon.jar installed somewhere, configure will try to detect them. If
+autodetection fails, try to tweak DOCS/xml/configure to get it working and
+send us a patch :)
+
+On Red Hat systems you need the following packages:
+libxml2, libxslt, docbook-dtds, docbook-style-xsl
 
 
 
@@ -25,7 +29,7 @@ Installing the required tools from source
 1) Download libxslt AND libxml2 packages from
    http://xmlsoft.org/XSLT/downloads.html
 
-   Installing them should be straightforward, executing the usual "./configure"
+   Installing them should be straightforward, execute the usual "./configure"
    and "make" then "make install" commands.
 
 
@@ -59,27 +63,20 @@ Installing the required tools from source
 Building the documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-1) Before trying to build the documentation, run
-
-	make test
-
-   to see if everything is set up properly.  If something goes wrong,
-   check the Configuration section of the toplevel Makefile and adjust
-   the variables.
-
+Before trying to build the documentation, run
 
-2) Now simply run
+	make help
 
-	make all
-
-   to build the documentation.
+to see all available build targets and make your choice. If something goes
+wrong, check the Configuration section of the toplevel Makefile and adjust
+the variables.
 
 
 A few words about SGML catalog files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 As far as I know, the document type declaration in XML files requires
-both a public and a system identifier.  For example:
+both a public and a system identifier. For example:
 
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 	"/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd">
@@ -96,14 +93,10 @@ is the system identifier.
 
 The problem is that the system identifier is most probably system-dependent.
 To avoid the need to manually fix the system identifiers before building the
-documentation, I've decided to use SGML catalogs.  If you have your catalogs
+documentation, I've decided to use SGML catalogs. If you have your catalogs
 set up correctly, xmllint and xsltproc will use them to find the DTDs
 based on the public identifiers.
 
 Note that this works only if public identifiers override system identifiers
-(i.e. the catalog file must contain 'OVERRIDE YES').  (I had no problem with
+(i.e. the catalog file must contain 'OVERRIDE YES'). (I had no problem with
 these on my system, since the Debian people took care of everything. ;-))
-
-
---
-Andras Mohari
diff --git a/DOCS/xml/configure b/DOCS/xml/configure
index dd57c0968f..de6c1784ca 100755
--- a/DOCS/xml/configure
+++ b/DOCS/xml/configure
@@ -6,7 +6,7 @@
 _xsltwrapper="xsltproc.sh"
 _xmllintwrapper="xmllint.sh"
 
-for _try_catalog in /etc/sgml/catalog /usr/share/sgml/docbook/xml-dtd-4.1.2/xmlcatalog /usr/share/apps/ksgmltools2/customization/en/catalog /usr/share/sgml/catalog /usr/local/share/sgml/catalog /usr/lib/sgml/catalog /usr/local/lib/sgml/catalog /usr/share/docbook-xml42/catalog.xml
+for _try_catalog in /etc/sgml/catalog /usr/share/sgml/docbook/xml-dtd-4.1.2/xmlcatalog /usr/share/apps/ksgmltools2/customization/en/catalog /usr/share/sgml/catalog /usr/local/share/sgml/catalog /usr/lib/sgml/catalog /usr/local/lib/sgml/catalog /usr/share/docbook-xml42/catalog.xml /usr/share/sgml/docbook/xmlcatalog
 do
   if test -f "$_try_catalog"
   then
@@ -27,7 +27,7 @@ fi
 
 echo "Searching for stylesheets..."
 echo "Searching for html/chunk.xsl..."
-for _try_chunk_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/share/docbook-xsl/html/chunk.xsl
+for _try_chunk_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/chunk.xsl /usr/share/docbook-xsl/html/chunk.xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl
 do
   if test -f "$_try_chunk_xsl"
   then
@@ -46,7 +46,7 @@ else
 fi
 
 echo "Searching for html/docbook.xsl..."
-for _try_docbook_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/share/docbook-xsl/html/docbook.xsl
+for _try_docbook_xsl in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/local/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl /usr/local/share/sgml/docbook/yelp/docbook/html/docbook.xsl /usr/share/docbook-xsl/html/docbook.xsl /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl
 do
   if test -f "$_try_docbook_xsl"
   then