[gnome-control-center/extensible-shell] [shell] Make the desktop file name match the process name

[William Jon McCann <mccann src gnome org>]

commit eb3dd23f6ef10476403328e22fcae8f1c9faea0d
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Feb 2 00:33:41 2010 -0500

    [shell] Make the desktop file name match the process name
    
    This ensures that WM_CLASS will be set properly.  See
    http://live.gnome.org/GnomeShell/ApplicationBased

 configure.ac                                       |    2 +-
 shell/Makefile.am                                  |   13 ++++++++++---
 ...op.in.in => gnome-control-center.desktop.in.in} |    0
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f3a0047..6dfe7b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ libgnome-control-center-extension/libgnome-control-center-extension.pc
 libgnome-control-center-extension/libgnome-control-center-extension-uninstalled.pc
 po/Makefile.in
 shell/Makefile
-shell/gnomecc.desktop.in
+shell/gnome-control-center.desktop.in
 typing-break/Makefile
 ])
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7cccb27..84a3483 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -27,7 +27,8 @@ AM_CPPFLAGS =							\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""		\
 	-DEXTENSIONSDIR="\"$(EXTENSIONSDIR)\""			\
 	-DUIDIR="\"$(uidir)\""					\
-	-DMENUDIR="\"$(menudir)\""
+	-DMENUDIR="\"$(menudir)\""				\
+	$(NULL)
 
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA = gnomecc.menu
@@ -36,7 +37,7 @@ uidir = $(pkgdatadir)/ui
 ui_DATA = shell.ui
 
 sysdir = $(datadir)/applications
-sys_in_files = gnomecc.desktop.in
+sys_in_files = gnome-control-center.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -58,7 +59,13 @@ if GCONF_SCHEMAS_INSTALL
 	fi
 endif
 
-EXTRA_DIST = $(ui_DATA) gnomecc.desktop.in.in gnomecc.directory.in gnomecc.menu $(schemas_DATA).in
+EXTRA_DIST = 					\
+	$(ui_DATA)				\
+	gnome-control-center.desktop.in.in	\
+	gnomecc.directory.in			\
+	gnomecc.menu				\
+	$(schemas_DATA).in			\
+	$(NULL)
 
 DISTCLEANFILES = gnomecc.desktop gnomecc.desktop.in gnomecc.directory $(schemas_DATA)
 
diff --git a/shell/gnomecc.desktop.in.in b/shell/gnome-control-center.desktop.in.in
similarity index 100%
rename from shell/gnomecc.desktop.in.in
rename to shell/gnome-control-center.desktop.in.in