[gnome-control-center] Remove gnomecc.directory

[Jasper St. Pierre <jstpierre src gnome org>]

commit 39c81b399d5945a9d91020a9a2f84e61921d4bb9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Feb 15 20:15:05 2013 -0500

    Remove gnomecc.directory
    
    gnome-menus now ships its own directory file.

 shell/Makefile.am          |    8 +-------
 shell/gnomecc.directory.in |    5 -----
 shell/gnomecc.menu.in      |    2 +-
 3 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 024d671..723fc6a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -86,11 +86,6 @@ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
 menudir = $(sysconfdir)/xdg/menus
 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
        $(AM_V_GEN) cat $< | sed 's,@applicationsdir@,$(datadir)/applications/,' > $@
 
@@ -117,11 +112,10 @@ EXTRA_DIST =                                      \
        gnome-control-center.desktop.in.in      \
        $(completion_in_files)                  \
        list-panel.sh                           \
-       gnomecc.directory.in                    \
        gnomecc.menu.in
 
 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
 test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
diff --git a/shell/gnomecc.menu.in b/shell/gnomecc.menu.in
index 8701aa2..7c59cbb 100644
--- a/shell/gnomecc.menu.in
+++ b/shell/gnomecc.menu.in
@@ -3,7 +3,7 @@
 
 <Menu>
   <Name>Control Center</Name>
-  <Directory>gnomecc.directory</Directory>
+  <Directory>X-GNOME-SystemSettings.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
   <AppDir>@applicationsdir@</AppDir>