diff options
| author | Glynn Foster <glynn.foster@sun.com> | 2006-04-05 05:48:28 +0000 |
|---|---|---|
| committer | Glynn Foster <gman@src.gnome.org> | 2006-04-05 05:48:28 +0000 |
| commit | 6c0c9e1a6c18b40a94e344ab8e9f6c6c67eef293 (patch) | |
| tree | d82e8d935feff2201f434e85b6a240b7ff3372de | |
| parent | a1f3d207b00d763eba9dd582330ea871b2508358 (diff) | |
| download | gnome-control-center-6c0c9e1a6c18b40a94e344ab8e9f6c6c67eef293.tar.gz | |
Move the .directory files to $datadir/desktop-directories. Fixes #334405.
2006-04-05 Glynn Foster <glynn.foster@sun.com>
* Makefile.am: Move the .directory files to
$datadir/desktop-directories. Fixes #334405.
| -rw-r--r-- | vfs-methods/fontilus/ChangeLog | 5 | ||||
| -rw-r--r-- | vfs-methods/fontilus/Makefile.am | 8 | ||||
| -rw-r--r-- | vfs-methods/themus/ChangeLog | 5 | ||||
| -rw-r--r-- | vfs-methods/themus/Makefile.am | 6 |
4 files changed, 17 insertions, 7 deletions
diff --git a/vfs-methods/fontilus/ChangeLog b/vfs-methods/fontilus/ChangeLog index b19bbb03c..030933faf 100644 --- a/vfs-methods/fontilus/ChangeLog +++ b/vfs-methods/fontilus/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Glynn Foster <glynn.foster@sun.com> + + * Makefile.am: Move the .directory files to + $datadir/desktop-directories. Fixes #334405. + 2006-01-30 Ed Catmur <ed@catmur.co.uk> Fixes #329043 diff --git a/vfs-methods/fontilus/Makefile.am b/vfs-methods/fontilus/Makefile.am index e110f64fe..718380403 100644 --- a/vfs-methods/fontilus/Makefile.am +++ b/vfs-methods/fontilus/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \ - $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" + $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules vfsmodule_LTLIBRARIES = libfont-method.la @@ -28,8 +28,8 @@ libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules vfsmoduleconf_DATA = font-method.conf -vfsdirectorydir = $(datadir)/gnome/vfolders -vfsdirectory_DATA = font-method.directory +directorydir = $(datadir)/desktop-directories +directory_DATA = font-method.directory schemasdir = $(GCONF_SCHEMA_FILE_DIR) schemas_DATA = fontilus.schemas @@ -60,7 +60,7 @@ uninstall-local: @INTLTOOL_SCHEMAS_RULE@ CLEANFILES = $(desktop_in_files) $(desktop_DATA) \ - $(schemas_DATA) $(vfsdirectory_DATA) + $(schemas_DATA) $(directory_DATA) EXTRA_DIST = \ font-method.conf \ diff --git a/vfs-methods/themus/ChangeLog b/vfs-methods/themus/ChangeLog index 5e2178823..2fef107fe 100644 --- a/vfs-methods/themus/ChangeLog +++ b/vfs-methods/themus/ChangeLog @@ -1,3 +1,8 @@ +2006-04-05 Glynn Foster <glynn.foster@sun.com> + + * Makefile.am: Move the .directory files to + $datadir/desktop-directories. Fixes #334405. + 2005-11-14 Sebastien Bacher <seb128@debian.org> * theme-thumbnailer.c: (main): diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am index cf4560009..648f84322 100644 --- a/vfs-methods/themus/Makefile.am +++ b/vfs-methods/themus/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \ $(THEMUS_APPLIER_CFLAGS) \ -I$(top_srcdir)/capplets/common \ -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \ - -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \ + -DDIRECTORY_DIR=\"$(directorydir)\" \ -DDATA_DIR=\"$(datadir)/themus\" bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier @@ -48,8 +48,8 @@ Glade_DATA = apply-font.glade vfsmoduleconfdir = $(sysconfdir)/gnome-vfs-2.0/modules vfsmoduleconf_DATA = theme-method.conf -vfsdirectorydir = $(datadir)/gnome/vfolders -vfsdirectory_DATA = theme-method.directory +directorydir = $(datadir)/desktop-directories +directory_DATA = theme-method.directory schemasdir = $(GCONF_SCHEMA_FILE_DIR) schemas_in_files = themus.schemas.in |