[gtk-osx] Fix XML_CATALOG_FILES, remove un-needed with-xml-catalog autogenarg from gtk-doc.

[John Ralls <jralls src gnome org>]

commit d78833805fe41a7ec1795bd4ffbbb21dc0dbacde
Author: John Ralls <jralls ceridwen us>
Date:   Mon Aug 20 21:40:11 2018 -0700

    Fix XML_CATALOG_FILES, remove un-needed with-xml-catalog autogenarg from gtk-doc.

 jhbuildrc-gtk-osx                             | 2 +-
 modulesets-stable/gtk-osx-bootstrap.modules   | 3 +--
 modulesets-unstable/gtk-osx-bootstrap.modules | 3 +--
 modulesets/gtk-osx-bootstrap.modules          | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 8c7e6af..41ced0a 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -493,7 +493,7 @@ prependpath('PERL5LIB', prefix + '/lib/perl5/site_perl')
 
 # Point gtk-doc and other xsltproc users to our XML catalog.
 #
-_pfx_cat_file = os.path.join(prefix, 'etc', 'xml', 'catalog')
+_pfx_cat_file = os.path.join(prefix, 'share', 'xml', 'catalog')
 if not os.path.exists(_pfx_cat_file):
     os.makedirs(os.path.dirname(_pfx_cat_file))
     open(_pfx_cat_file, "w").close()
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index ee1bb51..467e504 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -116,8 +116,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc" autogen-sh="configure"
-             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
+  <autotools id="gtk-doc" autogen-sh="configure">
     <branch version="1.27" module="gtk-doc/1.27/gtk-doc-1.27.tar.xz"
             hash="sha256:e26bd3f7080c749b1cb66c46c6bf8239e2f320a949964fb9c6d56e1b0c6d9a6f"/>
     <dependencies>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 3c9f8c2..63f5c32 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -108,8 +108,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc"
-             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
+  <autotools id="gtk-doc">
     <branch repo="git.gnome.org"/>
     <dependencies>
       <dep package="libxml2"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index cfd1a3f..8493f03 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -111,8 +111,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-doc"
-             autogenargs="--with-xml-catalog=$JHBUILD_PREFIX/share/xml/catalog">
+  <autotools id="gtk-doc">
     <branch repo="git.gnome.org" version="1.25" tag="GTK_DOC_1_25"/>
     <dependencies>
       <dep package="libxml2"/>