[rygel] plugins: Respect 'uninstalled' flag

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit fe7258fc7cc6d35b3036a43a41da02449dad524d
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Jun 16 23:22:24 2009 +0300

    plugins: Respect 'uninstalled' flag
    
    Plugins should load xml files from source tree when built with
    '--enable-uninstalled' configure flag.

 src/plugins/external/Makefile.am     |    8 +++++++-
 src/plugins/gst-renderer/Makefile.am |    9 +++++++--
 src/plugins/media-export/Makefile.am |    6 ++++++
 src/plugins/mediathek/Makefile.am    |    8 +++++++-
 src/plugins/test/Makefile.am         |    8 +++++++-
 src/plugins/tracker/Makefile.am      |    8 +++++++-
 6 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 89c7af7..ad75d79 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-external.la
@@ -7,7 +13,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
 	    $(GEE_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
+	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"'
 
 librygel_external_la_SOURCES = rygel-external-content-dir.vala \
 			       rygel-external-container.vala \
diff --git a/src/plugins/gst-renderer/Makefile.am b/src/plugins/gst-renderer/Makefile.am
index 79f0594..6b510ea 100644
--- a/src/plugins/gst-renderer/Makefile.am
+++ b/src/plugins/gst-renderer/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-gst.la
@@ -7,8 +13,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(GEE_CFLAGS) \
 	    $(GTK_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
-	    $(LIBGCONF_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
+	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"'
 
 BUILT_SOURCES = rygel-gst-connection-manager.c \
 		rygel-gst-rendering-control.c \
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 093d516..fd696a9 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-media-export.la
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 3727ea1..ef37e8a 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-mediathek.la
@@ -8,7 +14,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
 	    $(GEE_CFLAGS) \
 	    -I$(top_srcdir)/src/rygel \
-	    -DDATA_DIR='"$(datadir)"'
+	    -DDATA_DIR='"$(shareddir)"'
 
 librygel_mediathek_la_SOURCES = rygel-mediathek-asx-playlist.vala \
 				rygel-mediathek-plugin.vala \
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index 59ebe52..081da27 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-test.la
@@ -7,7 +13,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
 	    $(GEE_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
+	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"'
 
 librygel_test_la_SOURCES = rygel-test-content-dir.vala \
 			   rygel-test-root-container.vala \
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 2418883..7bfe9e8 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -1,3 +1,9 @@
+if UNINSTALLED
+shareddir = $(abs_top_builddir)/data
+else
+shareddir = $(datadir)/rygel
+endif
+
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-media-tracker.la
@@ -7,7 +13,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBDBUS_GLIB_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
 	    $(GEE_CFLAGS) \
-	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
+	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(shareddir)"'
 
 librygel_media_tracker_la_SOURCES = \
 				    rygel-media-tracker.vala \