Fix path in org.a11y.atspi.gschema.xml for lib64

This requires substituting the path in from a make rule, since
otherwise you'll get "${exec_prefix}/lib" if the user didn't
explicitly specify --libdir

https://bugzilla.gnome.org/show_bug.cgi?id=640220

diff --git a/configure.ac b/configure.ac
index 53f360c..1795b8a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -132,7 +132,6 @@ AC_CONFIG_FILES([Makefile
                 atk-adaptor/gtk-3.0/Makefile
                 po/Makefile.in
                  schemas/Makefile
-schemas/org.a11y.atspi.gschema.xml
                ])
 
 AC_OUTPUT

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 17a46d1..96ff710 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,5 +1,10 @@
 gsettings_SCHEMAS = org.a11y.atspi.gschema.xml
 
+org.a11y.atspi.gschema.xml: org.a11y.atspi.gschema.xml.in Makefile
+       $(AM_V_GEN) sed -e "s|@libdir[@]|$(libdir)|" $< > $@
+
+CLEANFILES = org.a11y.atspi.gschema.xml
+
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \

diff --git a/schemas/org.a11y.atspi.gschema.xml.in b/schemas/org.a11y.atspi.gschema.xml.in
index 3e86f30..43d27aa 100644 (file)
--- a/schemas/org.a11y.atspi.gschema.xml.in
+++ b/schemas/org.a11y.atspi.gschema.xml.in
@@ -2,7 +2,7 @@
 <schemalist>
   <schema id="org.a11y.atspi" path="/a11y/atspi/">
     <key name="atk-bridge-location" type="s">
-      <default>'@prefix@/lib/gtk-3.0/modules/libatk-bridge.so'</default>
+      <default>'@libdir@/gtk-3.0/modules/libatk-bridge.so'</default>
       <summary>Atk-bridge location</summary>
       <description>The path to the atk-bridge module; useful for non-GTK applications/toolkits that want to load it.</description>
     </key>