Commit 39c81b39 authored by Jasper St. Pierre's avatar Jasper St. Pierre

Remove gnomecc.directory

gnome-menus now ships its own directory file.
parent 4b417ee3
...@@ -86,11 +86,6 @@ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\"" ...@@ -86,11 +86,6 @@ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
menudir = $(sysconfdir)/xdg/menus menudir = $(sysconfdir)/xdg/menus
menu_DATA = gnomecc.menu menu_DATA = gnomecc.menu
directorydir = $(datadir)/desktop-directories
directory_in_files = gnomecc.directory.in
directory_DATA = $(directory_in_files:.directory.in=.directory)
@INTLTOOL_DIRECTORY_RULE@
gnomecc.menu: gnomecc.menu.in gnomecc.menu: gnomecc.menu.in
$(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@ $(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
...@@ -117,11 +112,10 @@ EXTRA_DIST = \ ...@@ -117,11 +112,10 @@ EXTRA_DIST = \
gnome-control-center.desktop.in.in \ gnome-control-center.desktop.in.in \
$(completion_in_files) \ $(completion_in_files) \
list-panel.sh \ list-panel.sh \
gnomecc.directory.in \
gnomecc.menu.in gnomecc.menu.in
CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) CLEANFILES = $(BUILT_SOURCES) $(completion_DATA)
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.directory gnomecc.menu DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in gnomecc.menu
noinst_PROGRAMS = test-hostname noinst_PROGRAMS = test-hostname
test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
......
[Desktop Entry]
_Name=Control Center
Icon=gnome-settings
Type=Directory
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Menu> <Menu>
<Name>Control Center</Name> <Name>Control Center</Name>
<Directory>gnomecc.directory</Directory> <Directory>X-GNOME-SystemSettings.directory</Directory>
<!-- Read standard .directory and .desktop file locations --> <!-- Read standard .directory and .desktop file locations -->
<AppDir>@applicationsdir@</AppDir> <AppDir>@applicationsdir@</AppDir>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment