[MPlayer-DOCS] r31837 - trunk/DOCS/xml/configure
diego
subversion at mplayerhq.hu
Wed Jul 28 08:07:43 CEST 2010
Author: diego
Date: Wed Jul 28 08:07:43 2010
New Revision: 31837
Log:
cosmetics: Drop leading underscores from variable names.
Modified:
trunk/DOCS/xml/configure
Modified: trunk/DOCS/xml/configure
==============================================================================
--- trunk/DOCS/xml/configure Wed Jul 28 07:35:15 2010 (r31836)
+++ trunk/DOCS/xml/configure Wed Jul 28 08:07:43 2010 (r31837)
@@ -4,7 +4,7 @@
# the other stuff necessary to convert the XML documentation.
echo "Searching for XML catalogs..."
-for _try_catalog in \
+for try_catalog in \
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
@@ -17,16 +17,16 @@ for _try_catalog in \
/usr/share/docbook-xml42/catalog.xml \
/usr/share/sgml/docbook/xmlcatalog
do
- if test -f "$_try_catalog"
+ if test -f "$try_catalog"
then
- _catalog=$_try_catalog
+ catalog=$try_catalog
break
fi
done
-if test -n "$_catalog"
+if test -n "$catalog"
then
- echo "Found SGML catalog at $_catalog"
+ echo "Found SGML catalog at $catalog"
else
echo "No SGML catalog found."
fi
@@ -35,7 +35,7 @@ fi
echo "Searching for stylesheets..."
echo "Searching for html/chunk.xsl..."
-for _try_chunk_xsl in \
+for try_chunk_xsl in \
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
@@ -47,24 +47,24 @@ for _try_chunk_xsl in \
/opt/local/share/xsl/docbook-xsl/html/chunk.xsl \
do
- if test -f "$_try_chunk_xsl"
+ if test -f "$try_chunk_xsl"
then
- _chunk_xsl=$_try_chunk_xsl
+ chunk_xsl=$try_chunk_xsl
break
fi
done
-if test -z "$_chunk_xsl"
+if test -z "$chunk_xsl"
then
- _chunk_xsl=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl
- echo "Not found. Using default ($_chunk_xsl)"
- _fake_chunk_xsl=yes
+ chunk_xsl=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl
+ echo "Not found. Using default ($chunk_xsl)"
+ fake_chunk_xsl=yes
else
- echo "Found chunk.xsl at $_chunk_xsl"
+ echo "Found chunk.xsl at $chunk_xsl"
fi
echo "Searching for html/docbook.xsl..."
-for _try_docbook_xsl in \
+for try_docbook_xsl in \
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
@@ -76,20 +76,20 @@ for _try_docbook_xsl in \
/opt/local/share/xsl/docbook-xsl/html/docbook.xsl \
do
- if test -f "$_try_docbook_xsl"
+ if test -f "$try_docbook_xsl"
then
- _docbook_xsl=$_try_docbook_xsl
+ docbook_xsl=$try_docbook_xsl
break
fi
done
-if test -z "$_docbook_xsl"
+if test -z "$docbook_xsl"
then
- _docbook_xsl=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
- echo "Not found. Using default ($_docbook_xsl)"
- _fake_docbook_xsl=yes
+ docbook_xsl=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl
+ echo "Not found. Using default ($docbook_xsl)"
+ fake_docbook_xsl=yes
else
- echo "Found docbook.xsl at $_docbook_xsl"
+ echo "Found docbook.xsl at $docbook_xsl"
fi
cat > html-chunk.xsl << EOF
@@ -100,7 +100,7 @@ cat > html-chunk.xsl << EOF
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
- <xsl:import href="$_chunk_xsl"/>
+ <xsl:import href="$chunk_xsl"/>
<xsl:include href="html-common.xsl"/>
</xsl:stylesheet>
@@ -115,7 +115,7 @@ cat > html-single.xsl << EOF
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
- <xsl:import href="$_docbook_xsl"/>
+ <xsl:import href="$docbook_xsl"/>
<xsl:include href="html-common.xsl"/>
</xsl:stylesheet>
@@ -123,7 +123,7 @@ EOF
echo "Searching for DTD..."
#FIXME: This should prefer higher version numbers, not the other way around ..
-for _try_dtd in \
+for try_dtd in \
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \
@@ -133,19 +133,19 @@ for _try_dtd in \
/opt/local/share/xml/docbook*/*/docbookx.dtd \
/usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd
do
- if test -f "$_try_dtd"
+ if test -f "$try_dtd"
then
- _dtd=$_try_dtd
+ dtd=$try_dtd
break
fi
done
-if test -z "$_dtd"
+if test -z "$dtd"
then
- _dtd=/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd
- echo "Not found. Using default ($_dtd)."
+ dtd=/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd
+ echo "Not found. Using default ($dtd)."
else
- echo "Found docbookx.dtd at $_dtd"
+ echo "Found docbookx.dtd at $dtd"
fi
for lang in `grep 'DOC_LANGS =' ../../config.mak|cut -d= -f2`; do
@@ -155,7 +155,7 @@ for lang in `grep 'DOC_LANGS =' ../../co
This file is generated automatically. DO NOT EDIT.
************************************************** -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "$_dtd"
+ "$dtd"
[
EOF
@@ -175,14 +175,14 @@ done
echo "Looking for a valid XSLT processor..."
if xsltproc --version > /dev/null 2>&1
then
- if test -z "$_fake_chunk_xsl"
+ if test -z "$fake_chunk_xsl"
then
echo "Found xsltproc. If it works, it's probably the best choice."
- if test -n "$_catalog"
+ if test -n "$catalog"
then
- _xsltcommand="xsltproc --catalogs -o \$\$1 \$\$2 \$\$3"
+ xsltcommand="xsltproc --catalogs -o \$\$1 \$\$2 \$\$3"
else
- _xsltcommand="xsltproc -o \$\$1 \$\$2 \$\$3"
+ xsltcommand="xsltproc -o \$\$1 \$\$2 \$\$3"
fi
else
echo "Found xsltproc but no stylesheets on your system."
@@ -194,18 +194,18 @@ fi
echo "Searching for XML checker..."
if command -v xmllint > /dev/null 2>&1; then
echo "Found xmllint"
- if test -n "$_catalog"; then
- _xmllint_command="xmllint --noout --noent --postvalid --catalogs \$*"
+ if test -n "$catalog"; then
+ xmllint_command="xmllint --noout --noent --postvalid --catalogs \$*"
else
- _xmllint_command="xmllint --noout --noent --postvalid \$*"
+ xmllint_command="xmllint --noout --noent --postvalid \$*"
fi
else
echo "Not found"
- _xmllint_command=true
+ xmllint_command=true
fi
cat > xml.mak << EOF
-CATALOG = $_catalog
-XMLLINT_COMMAND = $_xmllint_command
-XSLT_COMMAND = $_xsltcommand
+CATALOG = $catalog
+XMLLINT_COMMAND = $xmllint_command
+XSLT_COMMAND = $xsltcommand
EOF
More information about the MPlayer-DOCS
mailing list