From 4ca796c91ecd6d142b3c642089dc04ab2b69d21c Mon Sep 17 00:00:00 2001
From: Bradford Hovinen <hovinen@ximian.com>
Date: Mon, 14 Jan 2002 20:50:44 +0000
Subject: [PATCH] Rename binary gnome2-control-center Update

2002-01-14  Bradford Hovinen  <hovinen@ximian.com>

	* Makefile.am (bin_PROGRAMS): Rename binary gnome2-control-center
	Update
---
 control-center/ChangeLog   |  1 +
 control-center/Makefile.am | 14 +++++++-------
 control-center/main.c      |  4 +++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 4f4be3b64..365c7c68e 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,6 +1,7 @@
 2002-01-14  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am (bin_PROGRAMS): Rename binary gnome2-control-center
+	Update
 
 2002-01-09  Jean Schurger <jschurger@schurger.org>
 
diff --git a/control-center/Makefile.am b/control-center/Makefile.am
index 096c8501a..69464857d 100644
--- a/control-center/Makefile.am
+++ b/control-center/Makefile.am
@@ -1,4 +1,4 @@
-appicondir = $(datadir)/control-center/icons
+appicondir = $(datadir)/control-center-2/icons
 appicon_DATA = control-center.png
 
 splashdir = $(datadir)/pixmaps/gnomecc
@@ -13,7 +13,7 @@ sys_in_files = gnomecc.desktop.in
 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir = $(datadir)/control-center/interfaces
+gladedir = $(datadir)/control-center-2/interfaces
 glade_DATA = \
 	gnomecc.glade	\
 	gnome-lockscreen.png	\
@@ -24,9 +24,9 @@ glade_DATA = \
 
 INCLUDES = 							\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
-	-DGLADEDIR=\""$(datadir)/control-center/interfaces"\"	\
+	-DGLADEDIR=\""$(datadir)/control-center-2/interfaces"\"	\
 	-DVERSION=\""$(VERSION)"\"				\
-	-DSETTINGS_DIR=\""$(datadir)/control-center/capplets"\"	\
+	-DSETTINGS_DIR=\""$(datadir)/control-center-2/capplets"\"	\
 	-DPIXMAPS_DIR=\""$(appicondir)"\"			\
 	-DART_DIR=\""$(splashdir)"\"				\
 	-DGNOME_SBINDIR=\""$(sbindir)"\"			\
@@ -50,7 +50,7 @@ gnome2_control_center_LDADD = \
 EXTRA_DIST = gnomecc.desktop.in $(appicon_DATA) $(splash_DATA) $(glade_DATA) Gnome.directory.in.in
 
 paneldir        = $(datadir)/gnome/apps/Settings
-ccenterdir      = $(datadir)/control-center/capplets
+ccenterdir      = $(datadir)/control-center-2/capplets
 ccenter_DATA = Gnome.directory
 groups = Gnome
 groups_files = $(groups:=.directory)
@@ -64,8 +64,8 @@ $(groups_files): %.directory: %.directory.in
 	$(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets
-	$(INSTALL_DATA) Gnome.directory $(DESTDIR)$(datadir)/control-center/capplets/.directory
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center-2/capplets
+	$(INSTALL_DATA) Gnome.directory $(DESTDIR)$(datadir)/control-center-2/capplets/.directory
 
 
 
diff --git a/control-center/main.c b/control-center/main.c
index 889ebae8b..140ce3ef6 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -44,7 +44,9 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 
 	gnome_program_init ("control-center", VERSION, LIBGNOMEUI_MODULE,
-			    argc, argv, NULL);
+			    argc, argv,
+			    GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
+			    NULL);
 
 	gconf_init (argc, argv, NULL);