Merge branch 'master' into mgorse

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / Makefile.am

diff --git a/atk-adaptor/Makefile.am b/atk-adaptor/Makefile.am
index 129f491..5d89a2d 100644 (file)
--- a/atk-adaptor/Makefile.am
+++ b/atk-adaptor/Makefile.am
@@ -1,4 +1,8 @@
-gtkmoduledir = $(libdir)/$(GTK_MODULE_DIR)
+if RELOCATE
+    gtkmoduledir = $(libdir)/gtk-2.0/modules/at-spi-dbus/modules
+else
+    gtkmoduledir = $(libdir)/gtk-2.0/modules
+endif
 gtkmodule_LTLIBRARIES = libatk-bridge.la
 
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
@@ -46,6 +50,7 @@ libatk_bridge_la_SOURCES =    \
        tree-adaptor.h          \
        value-adaptor.c
 
+if RELOCATE
 gtkpathdir = $(gtkmoduledir)/..
 gnomeautostartdir = $(datadir)/gnome/autostart
 gnomeautostart_DATA = atk-bridge.desktop
@@ -55,3 +60,4 @@ CLEANFILES = $(gnome_autostart_DATA)
 %.desktop: %.desktop.in Makefile.am
        sed -e "s,\@gtkpathdir\@,$(gtkpathdir)," \
        < $< > $@
+endif