From: Daniel Gustafsson <dgustafsson@postgresql.org>
Date: Mon, 27 Mar 2023 19:35:34 +0000 (+0200)
Subject: doc: Fix XML_CATALOG_FILES env var for Apple Silicon machines
X-Git-Tag: REL_11_20~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4257d34e310be2e16c782f9e9339907a34f708ce;p=thirdparty%2Fpostgresql.git

doc: Fix XML_CATALOG_FILES env var for Apple Silicon machines

Homebrew changed the prefix for Apple Silicon based machines, so
our advice for XML_CATALOG_FILES needs to mention both.  More info
on the Homebrew change can be found at:

https://github.com/Homebrew/brew/issues/9177

This is backpatch of commits 4c8d65408 and 5a91c7975, the latter
which contained a small fix based on a report from Dagfinn Ilmari
Mannsåker.

Author: Julien Rouhaud <julien.rouhaud@free.fr>
Discussion: https://postgr.es/m/20230327082441.h7pa2vqiobbyo7rd@jrouhaud
---

diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 9ec0937227b..7149dfd40ef 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -209,9 +209,13 @@ brew install docbook docbook-xsl libxslt fop
 
    <para>
     The Homebrew-supplied programs require the following environment variable
-    to be set:
+    to be set.  For Intel based machines, use this:
 <programlisting>
 export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
+</programlisting>
+    On Apple Silicon based machines, use this:
+<programlisting>
+export XML_CATALOG_FILES=/opt/homebrew/etc/xml/catalog
 </programlisting>
     Without it, <command>xsltproc</command> will throw errors like this:
 <programlisting>