Install in subdirectories

2007-12-17  William Jon McCann  <mccann@jhu.edu>

	* plugins/background/Makefile.am:
	* plugins/clipboard/Makefile.am:
	* plugins/default-editor/Makefile.am:
	* plugins/dummy/Makefile.am:
	* plugins/font/Makefile.am:
	* plugins/keybindings/Makefile.am:
	* plugins/mouse/Makefile.am:
	* plugins/xrandr/Makefile.am:
	* plugins/xrandr/Makefile.in:
	* plugins/xrdb/Makefile.am:
	* plugins/xsettings/Makefile.am:
	Install in subdirectories


svn path=/trunk/; revision=19

12 files changed, 26 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8919c2d7..bcb95eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2007-12-17  William Jon McCann  <mccann@jhu.edu>
 
+	* plugins/background/Makefile.am:
+	* plugins/clipboard/Makefile.am:
+	* plugins/default-editor/Makefile.am:
+	* plugins/dummy/Makefile.am:
+	* plugins/font/Makefile.am:
+	* plugins/keybindings/Makefile.am:
+	* plugins/mouse/Makefile.am:
+	* plugins/xrandr/Makefile.am:
+	* plugins/xrandr/Makefile.in:
+	* plugins/xrdb/Makefile.am:
+	* plugins/xsettings/Makefile.am:
+	Install in subdirectories
+
+2007-12-17  William Jon McCann  <mccann@jhu.edu>
+
 	* plugins/keyboard/Makefile.am:
 	* plugins/keyboard/modmap-dialog.glade:
 	Add missing glade file.
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index b5a053a5..38e31396 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =		\
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/background
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 24b17398..0a0063e5 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/clipboard
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/default-editor/Makefile.am b/plugins/default-editor/Makefile.am
index 50f13f6e..08daee1c 100644
--- a/plugins/default-editor/Makefile.am
+++ b/plugins/default-editor/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/default-editor
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 873c8a10..4fb85010 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/dummy
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/font/Makefile.am b/plugins/font/Makefile.am
index ea762734..9dd412de 100644
--- a/plugins/font/Makefile.am
+++ b/plugins/font/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/font
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/keybindings/Makefile.am b/plugins/keybindings/Makefile.am
index 0c9d30fd..0881d48a 100644
--- a/plugins/keybindings/Makefile.am
+++ b/plugins/keybindings/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/keybindings
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 14388a39..9aeac699 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/mouse
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 125f4eac..6f721332 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/xrandr
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/xrandr/Makefile.in b/plugins/xrandr/Makefile.in
index bbd79585..33864905 100644
--- a/plugins/xrandr/Makefile.in
+++ b/plugins/xrandr/Makefile.in
@@ -255,7 +255,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/xrandr
 INCLUDES = \
 	-I$(top_srcdir)/src		\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
diff --git a/plugins/xrdb/Makefile.am b/plugins/xrdb/Makefile.am
index 45afe77b..5549e217 100644
--- a/plugins/xrdb/Makefile.am
+++ b/plugins/xrdb/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS =		\
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/xrdb
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 620ec732..b2304331 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 modules_flags = -export_dynamic -avoid-version -module -no-undefined
 
-plugindir = $(libdir)/gnome-settings-daemon/plugins
+plugindir = $(libdir)/gnome-settings-daemon/plugins/xsettings
 
 INCLUDES = \
 	-I$(top_srcdir)/src		\