postgres.git / summary / log / commit / refs

commit    9850ef9fc123e479562011ae308bdabe5bfc04c3
Author:   Daniel Gustafsson <dgustafsson@postgresql.org>
Date:     Mon Mar 27 19:35:24 2023 +0000
First released in: 11.20, 12.15, 13.11, 14.8, 15.3

    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


 doc/src/sgml/docguide.sgml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index 55ef6417749..2d8d5cd64f2 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>


[parent: 29a20ff0617a]