mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-21 22:12:03 +01:00
Code Issues Projects Releases Wiki Activity

In asciidoc-helper.sh, be more verbose when a2x fails.

Browse source 
Previously, we said (more or less), "a2x is broken and here's how you could
try to fix it".  Instead, we now say "We need a2x to build manpages; a2x
didn't work; here is a fix that might work for you; alternatively you
could just skip manpage building."

Addresses bug 1524.

Also, give the message as a here-document rather than a bunch of echos.
This commit is contained in:
Nick Mathewson 2010-06-07 11:38:58 -04:00
parent 2aa6fc5ae8
commit f4f11adf4c
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug1524 Normal file
View file

@ -0,0 +1,3 @@
o Minor documentation fixes
- When a2x fails, mention that the user could disable manpages instead
of trying to fix their asciidoc installation.

20
doc/asciidoc-helper.sh
View file

@ -46,13 +46,19 @@ elif [ "$1" = "man" ]; then
if "$2" -f manpage $input; then
mv $base.1 $output;
else
echo "==================================";
echo;
echo "a2x is installed, but some required docbook support files are";
echo "missing. Please install docbook-xsl, docbook-xml, and";
echo "libxml2-utils (Debian) or similar.";
echo;
echo "==================================";
cat<<EOF
==================================
You need a working asciidoc installed to be able to build the manpage.
a2x is installed, but for some reason it isn't working. Sometimes
This happens because required docbook support files are missing.
Please install docbook-xsl, docbook-xml, and libxml2-utils (Debian) or
similar.
Alternatively, to build without manpages, use the --disable-asciidoc
argument when calling configure.
==================================
EOF
exit 1;
fi
fi