From 9919d5a9ca422a958bf346f84b40e5315aad6fe2 Mon Sep 17 00:00:00 2001 From: Mark Doffman Date: Thu, 17 Dec 2009 15:10:25 -0800 Subject: [PATCH] Use datarootdir for finding the introspection XML files. They are now in a shared directory under 'at-spi2'. --- atk-adaptor/Makefile.am | 2 +- configure.ac | 2 +- droute/droute.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am index 2a6cca8..1942bbc 100644 --- a/atk-adaptor/Makefile.am +++ b/atk-adaptor/Makefile.am @@ -10,7 +10,7 @@ libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \ $(DBIND_CFLAGS) \ $(DROUTE_CFLAGS) \ -I$(top_srcdir) \ - -DATSPI_INTROSPECTION_PATH=\"$(pkgdatadir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" + -DATSPI_INTROSPECTION_PATH=\"$(datarootdir)/$(DEFAULT_ATSPI_INTROSPECTION_PATH)\" libatk_bridge_la_LDFLAGS = -no-undefined \ -module \ diff --git a/configure.ac b/configure.ac index f6184a4..19de330 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_ARG_VAR([DEFAULT_ATSPI_INTROSPECTION_PATH], [Set the default path for the install ofDBus introspection XML relative to the pkgdatadir.]) if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then - DEFAULT_ATSPI_INTROSPECTION_PATH=dbus + DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus fi AC_ARG_ENABLE(relocate, [ --enable-relocate Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no) diff --git a/droute/droute.c b/droute/droute.c index 0cec8be..55020a7 100644 --- a/droute/droute.c +++ b/droute/droute.c @@ -449,6 +449,7 @@ handle_introspection (DBusConnection *bus, for (i=0; i < path->interfaces->len; i++) { gchar *interface = (gchar *) g_ptr_array_index (path->interfaces, i); + _DROUTE_DEBUG ("DRoute (appending interface): %s\n", interface); append_interface(output, interface, path->cnx->introspect_dir); } -- 2.7.4