[gnome-control-center/single-window-shell] [shell] Install menu and ui files

[William Jon McCann <mccann src gnome org>]

commit 9074de36c813a0640061252e5684c08efd3241f3
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Jan 11 11:49:05 2010 -0500

    [shell] Install menu and ui files

 shell/Makefile.am      |   15 ++++++++++-----
 shell/control-center.c |    4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index e8b44a1..11fbeec 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -13,6 +13,12 @@ INCLUDES =					\
 
 noinst_PROGRAMS = gnome-control-center 
 
+menudir = $(sysconfdir)/xdg/menus
+menu_DATA = gnomecc.menu
+
+uidir = $(pkgdatadir)
+ui_DATA = shell.ui
+
 gnome_control_center_SOURCES =		\
 	control-center.c
 
@@ -21,7 +27,9 @@ gnome_control_center_LDADD =						\
 	$(REAL_LIBSLAB_LIBS)
 
 AM_CPPFLAGS =							\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""		\
+	-DUIDIR="\"$(uidir)\""					\
+	-DMENUDIR="\"$(menudir)\""
 
 sysdir = $(datadir)/applications
 sys_in_files = gnomecc.desktop.in
@@ -46,10 +54,7 @@ if GCONF_SCHEMAS_INSTALL
 	fi
 endif
 
-menudir = $(sysconfdir)/xdg/menus
-menu_DATA = gnomecc.menu
-
-EXTRA_DIST = shell.ui gnomecc.desktop.in.in gnomecc.directory.in gnomecc.menu $(schemas_DATA).in
+EXTRA_DIST = $(ui_DATA) gnomecc.desktop.in.in gnomecc.directory.in gnomecc.menu $(schemas_DATA).in
 
 DISTCLEANFILES = gnomecc.desktop gnomecc.desktop.in gnomecc.directory $(schemas_DATA)
 
diff --git a/shell/control-center.c b/shell/control-center.c
index aaa02f0..8a91051 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -92,7 +92,7 @@ fill_model (GtkBuilder *b)
 
   vbox = W (b, "main-vbox");
 
-  t = gmenu_tree_lookup ("/etc/xdg/menus/gnomecc.menu", 0);
+  t = gmenu_tree_lookup (MENUDIR "/gnomecc.menu", 0);
 
   d = gmenu_tree_get_root_directory (t);
 
@@ -273,7 +273,7 @@ main (int argc, char **argv)
 
   b = gtk_builder_new ();
 
-  ret = gtk_builder_add_from_file (b, "shell.ui", NULL);
+  ret = gtk_builder_add_from_file (b, UIDIR "/shell.ui", NULL);
   if (ret == 0)
     {
       g_error ("Unable to load UI");