From 12b801cab4d639f3ac86f1009e6bfb3f589729c5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 21 Apr 2010 10:58:05 -0400
Subject: [PATCH] Nuke the gsettingsschemadir pc variable

Not really useful, just use $(prefix)/glib-2.0/schemas. We are getting
m4 sugar to coat this over, anyway.
---
 docs/reference/gio/migrating.xml | 21 ++++++++++++++-------
 gio-2.0.pc.in                    |  1 -
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/reference/gio/migrating.xml b/docs/reference/gio/migrating.xml
index 39a544d06..af3adbdf4 100644
--- a/docs/reference/gio/migrating.xml
+++ b/docs/reference/gio/migrating.xml
@@ -379,21 +379,28 @@ produces a <filename>org.gnome.font-rendering.gschema.xml</filename> file with t
       <para>
         The XML source file for your GSettings schema needs to get installed
         into <filename>$datadir/glib-2.0/schemas</filename>, and needs to be
-        compiled into a binary form by the <link linkend="gschema-compile">gschema-compile</link>
-        utility. GIO provides variables <literal>gsettingsschemadir</literal>
-        and <literal>gsettingsupdateschemacache</literal> for the location
-        and the command, which can be used in <filename>configure.in</filename>
-        as follows:
+        compiled into a binary form. At runtime, GSettings looks for compiled
+        schemas in the <filename>glib-2.0/schemas</filename> subdirectories
+        of all <envar>XDG_DATA_DIRS</envar> directories, so if you install
+        your schema in a different location, you need to set the
+        <envar>XDG_DATA_DIRS</envar> environment variable appropriately.
+      </para>
+      <para>
+        Schemas are compiled into binary form by the
+        <link linkend="gschema-compile">gschema-compile</link> utility.
+        GIO provides a <literal>gsettingsupdateschemacache</literal>
+        variable for the schema compiler, which can be used in
+        <filename>configure.in</filename> as follows:
 <programlisting>
-AC_SUBST(gsettingsschemadir, `pkg-config --variable gsettingsschemadir gio-2.0`)
 AC_SUBST(gsettingsupdateschemacache, `pkg-config --variable gsettingsupdateschemacache gio-2.0`)
 </programlisting>
         The corresponding <filename>Makefile.am</filename> fragment looks like
         this:
 <programlisting>
+gsettingsschemadir = $(prefix)/glib-2.0/schemas
 gsettingsschema_DATA = my.app.gschema.xml
 install-data-hook:
-        $(gsettingsupdateschemacache) $(gsettingsschemadir)
+        $(gsettingsupdateschemacache) $(DESTDIR)$(gsettingsschemadir)
 </programlisting>
       </para>
 
diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
index 30137bce6..f6309250b 100644
--- a/gio-2.0.pc.in
+++ b/gio-2.0.pc.in
@@ -4,7 +4,6 @@ libdir=@libdir@
 includedir=@includedir@
 
 giomoduledir=@GIO_MODULE_DIR@
-gsettingsschemadir=@datarootdir@/glib-2.0/schemas
 gsettingsupdateschemacache=@bindir@/gschema-compile
 
 Name: GIO