[eog-plugins] exif-display: Install UI files into datadir instead of libdir

[Felix Riemann <friemann src gnome org>]

commit 15e0727e3fa3f26ed7f0e7c63b752de6f993fb51
Author: Felix Riemann <friemann gnome org>
Date:   Tue Jul 12 18:40:00 2011 +0200

    exif-display: Install UI files into datadir instead of libdir

 plugins/exif-display/Makefile.am                   |    6 +++---
 .../exif-display/eog-exif-display-plugin-setup.c   |    2 +-
 plugins/exif-display/eog-exif-display-plugin.c     |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/plugins/exif-display/Makefile.am b/plugins/exif-display/Makefile.am
index c390f19..0fcb202 100644
--- a/plugins/exif-display/Makefile.am
+++ b/plugins/exif-display/Makefile.am
@@ -1,5 +1,6 @@
 # ExifDisplay plugin
-plugindir = $(libdir)/eog/plugins
+plugindir = $(EOG_PLUGINS_LIBS_DIR)
+uidir = $(EOG_PLUGINS_DATA_DIR)/exif-display
 
 INCLUDES = \
 	-I$(top_srcdir)/src 				\
@@ -7,7 +8,7 @@ INCLUDES = \
 	$(WARN_CFLAGS)					\
 	$(EXIFDISPLAY_CFLAGS)				\
 	-DEOG_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DEOG_PLUGINDIR=\""$(plugindir)"\"
+	-DEOG_EXIF_DISPLAY_DATA_DIR=\""$(uidir)"\"
 
 plugin_LTLIBRARIES = libexif-display.la
 
@@ -30,7 +31,6 @@ plugin_in_files = exif-display.plugin.desktop.in
 
 UI_FILES = exif-display.ui exif-display-config.ui
 ui_DATA = $(UI_FILES)
-uidir = $(plugindir)/exif-display
 
 %.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(AM_V_GEN)$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
diff --git a/plugins/exif-display/eog-exif-display-plugin-setup.c b/plugins/exif-display/eog-exif-display-plugin-setup.c
index 7ab17c7..1617726 100644
--- a/plugins/exif-display/eog-exif-display-plugin-setup.c
+++ b/plugins/exif-display/eog-exif-display-plugin-setup.c
@@ -35,7 +35,7 @@
 
 #include "eog-exif-display-plugin-setup.h"
 
-#define GTKBUILDER_CONFIG_FILE EOG_PLUGINDIR"/exif-display/exif-display-config.ui"
+#define GTKBUILDER_CONFIG_FILE EOG_EXIF_DISPLAY_DATA_DIR"/exif-display-config.ui"
 
 static void
 peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface);
diff --git a/plugins/exif-display/eog-exif-display-plugin.c b/plugins/exif-display/eog-exif-display-plugin.c
index 3719b54..8e0d2ca 100644
--- a/plugins/exif-display/eog-exif-display-plugin.c
+++ b/plugins/exif-display/eog-exif-display-plugin.c
@@ -44,7 +44,7 @@
 #include "eog-exif-display-plugin-setup.h"
 #include "eog-exif-display-plugin.h"
 
-#define GTKBUILDER_FILE EOG_PLUGINDIR"/exif-display/exif-display.ui"
+#define GTKBUILDER_FILE EOG_EXIF_DISPLAY_DATA_DIR"/exif-display.ui"
 
 enum {
 	PROP_O,