[gtk-osx] Pass --libdir to libxml2

[John Ralls <jralls src gnome org>]

commit bfbf61fb447e74dedd6bdf7cc96a7003dcbc0025
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Apr 17 23:09:26 2015 -0700

    Pass --libdir to libxml2
    
    This is not a problem on the pinned revision of JHbuild, but newer
    versions don't pass --libdir anymore by default. However, if you are
    using the system Python and don't pass --libdir, then you will install
    your libxml2 Python module in the system Python modules directory under
    /Library. This doesn't fail the build, because of $(DESTDIR), but it
    also doesn't install the Python module in the right place.

 modulesets-stable/gtk-osx-bootstrap.modules   |    3 ++-
 modulesets-unstable/gtk-osx-bootstrap.modules |    2 +-
 modulesets/gtk-osx-bootstrap.modules          |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 2eb5db1..c55c864 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -60,7 +60,8 @@
        module won't link. In case you're wondering, itstool
        needs libxml2's python module. -->
 
-  <autotools id="libxml2" autogen-sh="configure" autogenargs="--with-python">
+  <autotools id="libxml2" autogen-sh="configure"
+             autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
     <branch version="2.9.2" module="libxml2-2.9.2.tar.gz"
            repo="xmlsoft.org"/>
     <after>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 9e52562..e6e6b0c 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -59,7 +59,7 @@
      otherwise the links in the SDKs are messed up and libxml's python
      module won't link. In case you're wondering, itstool
      needs libxml2's python module. -->
-  <autotools id="libxml2" autogenargs="--with-python">
+  <autotools id="libxml2" autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
     <branch repo="git.gnome.org"/>
     <after>
       <dep package="python2.7"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 8dda276..d3b3c07 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -60,7 +60,8 @@
        module won't link. In case you're wondering, itstool
        needs libxml2's python module. -->
 
-  <autotools id="libxml2" autogen-sh="configure" autogenargs="--with-python">
+  <autotools id="libxml2" autogen-sh="configure"
+             autogenargs='--libdir="$JHBUILD_LIBDIR" --with-python'>
     <branch version="2.9.2" module="libxml2-2.9.2.tar.gz"
            repo="xmlsoft.org"/>
     <after>