[nautilus-actions] na-xml data files are installed in their own subdir

[Pierre Wieser <pwieser src gnome org>]

commit 840f21c85ba2ee2b8376a157b654eecdaaf5a7bb
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 2 22:41:54 2012 +0100

    na-xml data files are installed in their own subdir

 ChangeLog                  |    4 ++++
 src/io-xml/Makefile.am     |   14 +++++++++++---
 src/io-xml/naxml-formats.c |    2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8132003..3e636c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-02 Pierre Wieser <pwieser trychlos org>
 
+	* src/io-xml/Makefile.am:
+	* src/io-xml/naxml-formats.c: Data files are installed in a private
+	subdirectory.
+
 	* src/io-desktop/Makefile.am:
 	* src/io-desktop/nadp-formats.c: Datafiles are installed in a private
 	subdirectory.
diff --git a/src/io-xml/Makefile.am b/src/io-xml/Makefile.am
index 9d81424..994cbff 100644
--- a/src/io-xml/Makefile.am
+++ b/src/io-xml/Makefile.am
@@ -26,14 +26,19 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
+provider_id = na-xml
+
 pkglib_LTLIBRARIES = libna-io-xml.la
 
+provider_datadir = $(pkgdatadir)/$(provider_id)
+
 AM_CPPFLAGS += \
 	-I $(top_srcdir)									\
 	-I $(top_srcdir)/src								\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_XML}\"			\
-	-DPKGDATADIR=\"$(pkgdatadir)\"						\
+	-DPROVIDER_ID=\"$(provider_id)\"					\
+	-DPROVIDER_DATADIR=\"$(provider_datadir)\"			\
 	$(NULL)
 
 libna_io_xml_la_SOURCES = \
@@ -67,10 +72,13 @@ images_files = \
 	export-schemas-v2.png								\
 	$(NULL)
 
-pkgdata_DATA = \
+provider_data_DATA = \
 	$(images_files)										\
 	$(NULL)
 
 EXTRA_DIST = \
-	$(pkgdata_DATA)										\
+	$(provider_data_DATA)								\
 	$(NULL)
+
+uninstall-local:
+	rmdir $(provider_datadir)
diff --git a/src/io-xml/naxml-formats.c b/src/io-xml/naxml-formats.c
index a5e9828..b7899cc 100644
--- a/src/io-xml/naxml-formats.c
+++ b/src/io-xml/naxml-formats.c
@@ -134,7 +134,7 @@ naxml_formats_get_formats( const NAIExporter* exporter )
 		str->label = g_strdup( gettext( naxml_formats[i].label ));
 		str->description = g_strdup( gettext( naxml_formats[i].description ));
 		if( naxml_formats[i].image ){
-			fname = g_strdup_printf( "%s/%s", PKGDATADIR, naxml_formats[i].image );
+			fname = g_strdup_printf( "%s/%s", PROVIDER_DATADIR, naxml_formats[i].image );
 			str->pixbuf = gdk_pixbuf_new_from_file_at_size( fname, width, height, NULL );
 			g_free( fname );
 #if 0