[eog-plugins] postasa: Put UI definition files into data dir instead of libdir



commit febbe7c3a56be0f74900838a12e3541768cf1016
Author: Felix Riemann <friemann gnome org>
Date:   Tue Jul 12 18:29:48 2011 +0200

    postasa: Put UI definition files into data dir instead of libdir
    
    Those files don't belong into /usr/lib/ but into /usr/share.

 plugins/postasa/Makefile.am          |    8 +++++---
 plugins/postasa/eog-postasa-plugin.c |    5 ++---
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/plugins/postasa/Makefile.am b/plugins/postasa/Makefile.am
index ddab46f..96335fe 100644
--- a/plugins/postasa/Makefile.am
+++ b/plugins/postasa/Makefile.am
@@ -1,5 +1,5 @@
 # Postasa plugin
-plugindir = $(libdir)/eog/plugins
+plugindir = $(EOG_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -7,7 +7,9 @@ INCLUDES = \
 	$(WARN_CFLAGS)					\
 	$(POSTASA_CFLAGS) 				\
 	-DEOG_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DEOG_PLUGINDIR=\""$(plugindir)"\"
+	-DEOG_POSTASA_PLUGIN_DIR=\""$(plugindir)"\"		\
+	-DEOG_POSTASA_DATA_DIR=\""$(EOG_PLUGINS_DATA_DIR)/postasa"\"
+
 
 plugin_LTLIBRARIES = libpostasa.la
 
@@ -29,7 +31,7 @@ plugin_in_files = postasa.plugin.desktop.in
 
 UI_FILES = postasa-config.xml postasa-uploads.xml
 ui_DATA = $(UI_FILES)
-uidir = $(plugindir)/postasa
+uidir = $(EOG_PLUGINS_DATA_DIR)/postasa
 
 %.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/postasa/eog-postasa-plugin.c b/plugins/postasa/eog-postasa-plugin.c
index 0f82941..e2d8de6 100644
--- a/plugins/postasa/eog-postasa-plugin.c
+++ b/plugins/postasa/eog-postasa-plugin.c
@@ -38,9 +38,8 @@
 
 #include <gdata/gdata.h>
 
-#define GTKBUILDER_CONFIG_FILE EOG_PLUGINDIR"/postasa/postasa-config.xml"
-#define GTKBUILDER_UPLOAD_FILE EOG_PLUGINDIR"/postasa/postasa-uploads.xml"
-#define DEFAULT_THUMBNAIL EOG_PLUGINDIR"/postasa/default.png"
+#define GTKBUILDER_CONFIG_FILE EOG_POSTASA_DATA_DIR"/postasa-config.xml"
+#define GTKBUILDER_UPLOAD_FILE EOG_POSTASA_DATA_DIR"/postasa-uploads.xml"
 
 enum {
 	PROP_O,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]