diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:31:24 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:31:24 -0400 |
| commit | 952f562691bb0888331afae3bec47541c0531467 (patch) | |
| tree | 76b4b375b1c190cb0770eadb761b0cb031fd481d | |
| parent | a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc (diff) | |
| parent | 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea (diff) | |
| download | tor-952f562691bb0888331afae3bec47541c0531467.tar.gz tor-952f562691bb0888331afae3bec47541c0531467.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
| -rw-r--r-- | changes/bug6436 | 3 | ||||
| -rwxr-xr-x | doc/asciidoc-helper.sh | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug6436 b/changes/bug6436 new file mode 100644 index 0000000000..2c163df105 --- /dev/null +++ b/changes/bug6436 @@ -0,0 +1,3 @@ + o Minor features: + - Provide a better error message about possible OSX Asciidoc failure + reasons. Fix for bug 6436. diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 33e1360a71..dd420f7c4f 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -54,7 +54,9 @@ 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. +similar. If you use homebrew on Mac OS X, install the docbook formula +and add "export XML_CATALOG_FILES=/usr/local/etc/xml/catalog" to your +.bashrc Alternatively, to build without manpages, use the --disable-asciidoc argument when calling configure. |