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.
This commit is contained in:
Glynn Foster 2006-04-05 05:48:28 +00:00 committed by Glynn Foster
parent a1f3d207b0
commit 6c0c9e1a6c
4 changed files with 17 additions and 7 deletions

View file

@ -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

View file

@ -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 \

View file

@ -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):

View file

@ -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