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

[Pierre Wieser <pwieser src gnome org>]

commit e6bec9643f4418aff6100d23321f4bb4e57d125e
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 2 22:37:18 2012 +0100

    na-desktop data files are installed in their own subdir

 ChangeLog                              |    4 ++++
 src/io-desktop/Makefile.am             |   14 +++++++++++---
 src/io-desktop/nadp-desktop-provider.c |    2 +-
 src/io-desktop/nadp-formats.c          |    2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 49fe70f..8132003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-02 Pierre Wieser <pwieser trychlos org>
 
+	* src/io-desktop/Makefile.am:
+	* src/io-desktop/nadp-formats.c: Datafiles are installed in a private
+	subdirectory.
+
 	* src/nact/nact-menubar.c (on_open_context_menu): Manages if event is
 	NULL.
 
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index 4d1d722..110277e 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -26,14 +26,19 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
+provider_id = na-desktop
+
 pkglib_LTLIBRARIES = libna-io-desktop.la
 
+provider_datadir = $(pkgdatadir)/$(provider_id)
+
 AM_CPPFLAGS += \
 	-I $(top_srcdir)									\
 	-I $(top_srcdir)/src								\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_IO_DESKTOP}\"		\
-	-DPKGDATADIR=\"$(pkgdatadir)\"						\
+	-DPROVIDER_ID=\"$(provider_id)\"					\
+	-DPROVIDER_DATADIR=\"$(provider_datadir)\"			\
 	$(NULL)
 
 libna_io_desktop_la_SOURCES = \
@@ -73,10 +78,13 @@ images_files = \
 	export-desktop.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-desktop/nadp-desktop-provider.c b/src/io-desktop/nadp-desktop-provider.c
index 66e398c..3c09da1 100644
--- a/src/io-desktop/nadp-desktop-provider.c
+++ b/src/io-desktop/nadp-desktop-provider.c
@@ -251,7 +251,7 @@ iio_provider_get_version( const NAIIOProvider *provider )
 static gchar *
 iio_provider_get_id( const NAIIOProvider *provider )
 {
-	return( g_strdup( "na-desktop" ));
+	return( g_strdup( PROVIDER_ID ));
 }
 
 static gchar *
diff --git a/src/io-desktop/nadp-formats.c b/src/io-desktop/nadp-formats.c
index 3284b8b..d414a10 100644
--- a/src/io-desktop/nadp-formats.c
+++ b/src/io-desktop/nadp-formats.c
@@ -110,7 +110,7 @@ nadp_formats_get_formats( const NAIExporter* exporter )
 		str->label = g_strdup( gettext( nadp_formats[i].label ));
 		str->description = g_strdup( gettext( nadp_formats[i].description ));
 		if( nadp_formats[i].image ){
-			fname = g_strdup_printf( "%s/%s", PKGDATADIR, nadp_formats[i].image );
+			fname = g_strdup_printf( "%s/%s", PROVIDER_DATADIR, nadp_formats[i].image );
 			str->pixbuf = gdk_pixbuf_new_from_file_at_size( fname, width, height, NULL );
 			g_free( fname );
 #if 0