From 5b853612fbc928e9477b06095838e76f37bce6fc Mon Sep 17 00:00:00 2001 From: Steven Murdoch Date: Fri, 20 Jul 2012 14:29:20 +0100 Subject: [PATCH 1/2] Clarify how to build asciidoc files using homebrew on Mac OS X --- doc/asciidoc-helper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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. From 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 20 Jul 2012 09:50:19 -0400 Subject: [PATCH 2/2] changes file for bug 6436. --- changes/bug6436 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changes/bug6436 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.