[at-spi2-atk] Fix path in org.a11y.atspi.gschema.xml for lib64
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-atk] Fix path in org.a11y.atspi.gschema.xml for lib64
- Date: Fri, 21 Jan 2011 22:25:42 +0000 (UTC)
commit 44e338566d2588efacc00d583bbe1d3eb6e876b9
Author: Dan Winship <danw gnome org>
Date: Fri Jan 21 15:37:10 2011 -0500
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
configure.ac | 1 -
schemas/Makefile.am | 5 +++++
schemas/org.a11y.atspi.gschema.xml.in | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 53f360c..1795b8a 100644
--- 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
--- 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
--- 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]